diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-06 13:46:50 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-06 13:46:50 +0200 |
| commit | d18a070a0393ac3846053bcef1833dd01856e117 (patch) | |
| tree | c238261eedc69ef4311a4f546a12ea4db60bf35e | |
| parent | 221bbd275cf8dfaec5810745ad319f0daeacc8d6 (diff) | |
| download | nextcloud-server-d18a070a0393ac3846053bcef1833dd01856e117.tar.gz nextcloud-server-d18a070a0393ac3846053bcef1833dd01856e117.zip | |
Have the "notsquare" error as data, not as message
| -rw-r--r-- | core/avatar/controller.php | 2 | ||||
| -rw-r--r-- | settings/js/personal.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 55fdd7f74a0..bc0eb6eff3b 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -71,7 +71,7 @@ class Controller { if ($image->valid()) { \OC_Cache::set('tmpavatar', $image->data(), 7200); - \OC_JSON::error(array("data" => array("message" => "notsquare") )); + \OC_JSON::error(array("data" => "notsquare")); } else { $l = new \OC_L10n('core'); diff --git a/settings/js/personal.js b/settings/js/personal.js index e9220ef9039..d6e2d8fbca9 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -108,7 +108,7 @@ function avatarResponseHandler(data) { $warning.hide(); if (data.status === "success") { updateAvatar(); - } else if (data.data.message === "notsquare") { + } else if (data.data === "notsquare") { showAvatarCropper(); } else { $warning.show(); |