From d18a070a0393ac3846053bcef1833dd01856e117 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Fri, 6 Sep 2013 13:46:50 +0200
Subject: [PATCH] Have the "notsquare" error as data, not as message
---
core/avatar/controller.php | 2 +-
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 55fdd7f74a..bc0eb6eff3 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 e9220ef903..d6e2d8fbca 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();
--
GitLab