diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-01 22:57:46 +0200 |
| commit | 9eab8b39df34b507530b0beceb31eb23fbea54f5 (patch) | |
| tree | 6b53d3f1b9aabd9d62092f1ad7b2568bd55b5c51 /core/js/jquery.avatar.js | |
| parent | ce58c32c901fb874264922dabec1692f9d05123d (diff) | |
| parent | 5ade595911261cf47cdad17deb4d1a013f523245 (diff) | |
| download | nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.tar.gz nextcloud-server-9eab8b39df34b507530b0beceb31eb23fbea54f5.zip | |
Merge branch 'master' into fixing-4620-master
Diffstat (limited to 'core/js/jquery.avatar.js')
| -rw-r--r-- | core/js/jquery.avatar.js | 6 |
1 files changed, 5 insertions, 1 deletions
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)+'">'); |