summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-18 20:26:53 +0200
committerGitHub <noreply@github.com>2016-10-18 20:26:53 +0200
commit3c698c8c7cd3630f7338338fd25db7279434a777 (patch)
tree828c4ca85532834636101276661299146ca31cae /settings
parent0c8bd9fa4937201dc6b8b70ea0f4af26721e1cc6 (diff)
parent9c3e855812454b3d0367f251e9940a53f687a4e0 (diff)
downloadnextcloud-server-3c698c8c7cd3630f7338338fd25db7279434a777.tar.gz
nextcloud-server-3c698c8c7cd3630f7338338fd25db7279434a777.zip
Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixes
Avatar/file-picker fixes for access-control app
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 3290074a84c..dbc82758fd1 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -306,8 +306,8 @@ $(document).ready(function () {
msg = data.jqXHR.responseJSON.data.message;
}
avatarResponseHandler({
- data: {
- message: t('settings', 'An error occurred: {message}', { message: msg })
+ data: {
+ message: msg
}
});
}
@@ -324,7 +324,7 @@ $(document).ready(function () {
url: OC.generateUrl('/avatar/'),
data: { path: path }
}).done(avatarResponseHandler)
- .fail(function(jqXHR, status){
+ .fail(function(jqXHR) {
var msg = jqXHR.statusText + ' (' + jqXHR.status + ')';
if (!_.isUndefined(jqXHR.responseJSON) &&
!_.isUndefined(jqXHR.responseJSON.data) &&
@@ -334,7 +334,7 @@ $(document).ready(function () {
}
avatarResponseHandler({
data: {
- message: t('settings', 'An error occurred: {message}', { message: msg })
+ message: msg
}
});
});