diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-02 17:07:38 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-02 17:07:38 +0200 |
| commit | e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2 (patch) | |
| tree | fce3f0677d4009bd483150f38190846197912c88 /core/avatar | |
| parent | 14cc1cd4b8d9e121e4f21851bf281bd4b565fb22 (diff) | |
| download | nextcloud-server-e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2.tar.gz nextcloud-server-e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2.zip | |
Fix some of @jancborchardt's complaints in oc_avatars
Diffstat (limited to 'core/avatar')
| -rw-r--r-- | core/avatar/controller.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 045d768dc14..5264327b641 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -34,7 +34,7 @@ class OC_Core_Avatar_Controller { \OC_Response::setETagHeader(crc32($image->data())); $image->show(); } elseif ($image === false) { - \OC_JSON::success(array('user' => \OC_User::getDisplayName($user), 'size' => $size)); + \OC_JSON::success(array('user' => $user, 'size' => $size)); } } @@ -104,7 +104,7 @@ class OC_Core_Avatar_Controller { $tmpavatar = \OC_Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); - \OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) )); + \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) )); return; } @@ -128,7 +128,7 @@ class OC_Core_Avatar_Controller { $tmpavatar = \OC_Cache::get('tmpavatar'); if (is_null($tmpavatar)) { $l = new \OC_L10n('core'); - \OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) )); + \OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) )); return; } |