From 1d50cab1c6aed0229b4d0fb8ddcb805b335cb321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Tue, 29 Nov 2016 11:24:35 +0100
Subject: [PATCH 1/2] Use displayname
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 core/js/sharedialogshareelistview.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 226f18b2d7..7fcda92d5f 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -22,7 +22,7 @@
 			'{{#each sharees}}' +
 				'<li data-share-id="{{shareId}}" data-share-type="{{shareType}}" data-share-with="{{shareWith}}">' +
 					'{{#if avatarEnabled}}' +
-					'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
+					'<div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" data-displayname="{{shareWithDisplayName}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
 					'{{/if}}' +
 					'<span class="has-tooltip username" title="{{shareWithTitle}}">{{shareWithDisplayName}}</span>' +
 					'<span class="sharingOptionsGroup">' +
@@ -269,7 +269,8 @@
 						$this.css({width: 32, height: 32});
 						$this.imageplaceholder($this.data('seed'));
 					} else {
-						$this.avatar($this.data('username'), 32);
+						//                         user,   size,  ie8fix, hidedefault,  callback, displayname
+						$this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'));
 					}
 				});
 			}

From e7a146bd62bd423810f3e87340234e2a49813c45 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 29 Nov 2016 13:40:41 +0100
Subject: [PATCH 2/2] fix tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 core/js/tests/specs/sharedialogviewSpec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index a44bb309c5..985610d51f 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -464,8 +464,9 @@ describe('OC.Share.ShareDialogView', function() {
 
 			it('test avatar user', function() {
 				var args = avatarStub.getCall(1).args;
-				expect(args.length).toEqual(2);
+				expect(args.length).toEqual(6);
 				expect(args[0]).toEqual('user1');
+				expect(args[5]).toEqual('User One');
 			});
 
 			it('test avatar for groups', function() {