wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Have the "notsquare" error as data, not as message

Browse source
This commit is contained in:
kondou 2013-09-06 13:46:50 +02:00
parent 221bbd275c
commit d18a070a03
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/avatar/controller.php
View file

@ -71,7 +71,7 @@ class Controller {
if ($image->valid()) { if ($image->valid()) {
\OC_Cache::set('tmpavatar', $image->data(), 7200); \OC_Cache::set('tmpavatar', $image->data(), 7200);
\OC_JSON::error(array("data" => array("message" => "notsquare") )); \OC_JSON::error(array("data" => "notsquare"));
} else { } else {
$l = new \OC_L10n('core'); $l = new \OC_L10n('core');

2
settings/js/personal.js
View file

@ -108,7 +108,7 @@ function avatarResponseHandler(data) {
$warning.hide(); $warning.hide();
if (data.status === "success") { if (data.status === "success") {
updateAvatar(); updateAvatar();
} else if (data.data.message === "notsquare") { } else if (data.data === "notsquare") {
showAvatarCropper(); showAvatarCropper();
} else { } else {
$warning.show(); $warning.show();