From 665979819766bd23cddc18a3e1666f303ac25932 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 29 Jan 2013 22:33:46 +0100
Subject: [PATCH] only change display name if the display name from the current
 user was changed; add correct display name to new user

---
 lib/user.php         | 4 +++-
 settings/js/users.js | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/user.php b/lib/user.php
index 3a35069fd62..6452f80602c 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -283,7 +283,9 @@ class OC_User {
 			$displayName = self::determineDisplayName($uid);
 			$result = true;
 		}
-		$_SESSION['display_name'] = $displayName;
+		if (OC_User::getUser() === $uid) {
+			$_SESSION['display_name'] = $displayName;
+		}
 		return $result;
 	}
 
diff --git a/settings/js/users.js b/settings/js/users.js
index a50fac03727..524a57e0776 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -70,7 +70,9 @@ var UserList = {
     add:function (username, groups, subadmin, quota, sort) {
         var tr = $('tbody tr').first().clone();
         tr.attr('data-uid', username);
+        tr.attr('data-displayName', username);
         tr.find('td.name').text(username);
+        tr.find('td.displayName').text(username);
         var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
         tr.find('td.groups').empty();
         if (tr.find('td.subadmins').length > 0) {
-- 
2.39.5