From b188de242ec7e2f0d00cc47218107ea3fc60fd72 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 20 Jan 2016 15:18:57 +0100
Subject: [PATCH] Show default placeholder if avatar image can't be fetched

* fixes owncloud/documents#601
* ref #14564
---
 core/js/jquery.avatar.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 7e97550ba1..d87c234e14 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -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) {