wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21811 from owncloud/fix-unauthenticated-avatar

Browse source 
Show default placeholder if avatar image can't be fetched
This commit is contained in:
Thomas Müller 2016-01-25 10:01:23 +01:00
commit 44043cb1d7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/js/jquery.avatar.js
View file

@ -81,8 +81,10 @@
// If the displayname is not defined we use the old code path
if (typeof(displayname) === 'undefined') {
$.get(url, function(result) {
if (typeof(result) === 'object') {
$.get(url).always(function(result, status) {
// if there is an error or an object returned (contains user information):
// -> show the fallback placeholder
if (typeof(result) === 'object' || status === 'error') {
if (!hidedefault) {
if (result.data && result.data.displayname) {
$div.imageplaceholder(user, result.data.displayname);
@ -94,6 +96,7 @@
} else {
$div.hide();
}
// else an image is transferred and should be shown
} else {
$div.show();
if (ie8fix === true) {