From 4907685405ead5df56ef0a5ac0b9af7c86885487 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Sat, 28 Sep 2013 16:46:53 +0200
Subject: Base defaultavatar text on displayname

Fix #4876
---
 core/js/jquery.avatar.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/js/jquery.avatar.js')

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)+'">');
-- 
cgit v1.2.3