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

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');
 

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();