diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-28 16:46:53 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-28 16:46:53 +0200 |
| commit | 4907685405ead5df56ef0a5ac0b9af7c86885487 (patch) | |
| tree | f63b1334a0474a448f2541ba310b5899ea985a48 /core | |
| parent | cb565a5f60921f3fdf3c42df12951e02a3bb338d (diff) | |
| download | nextcloud-server-4907685405ead5df56ef0a5ac0b9af7c86885487.tar.gz nextcloud-server-4907685405ead5df56ef0a5ac0b9af7c86885487.zip | |
Base defaultavatar text on displayname
Fix #4876
Diffstat (limited to 'core')
| -rw-r--r-- | core/avatar/controller.php | 2 | ||||
| -rw-r--r-- | core/js/jquery.avatar.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 9f7c0517c4a..22693824461 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -33,7 +33,7 @@ class Controller { $image->show(); } else { // Signalizes $.avatar() to display a defaultavatar - \OC_JSON::success(); + \OC_JSON::success(array("data"=> array("displayname"=> \OC_User::getDisplayName($user)) )); } } diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index f1382fd7d2d..88a4c25d1ee 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -69,7 +69,11 @@ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken; $.get(url, function(result) { if (typeof(result) === 'object') { - $div.placeholder(user); + if (result.data && result.data.displayname) { + $div.placeholder(user, result.data.displayname); + } else { + $div.placeholder(user); + } } else { if (ie8fix === true) { $div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">'); |