summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Kaiser <nico@kaiser.me>2013-10-11 21:41:04 +0200
committerNico Kaiser <nico@kaiser.me>2013-10-11 21:41:04 +0200
commit1c2b2909eb0c92e901e85ece5c8758ffdbf04c8f (patch)
tree137652fe27c56aabaff346fcdbf7b784a6f2aade
parentf89e96e06dbb4513ad6c4ada53a068e640b4289b (diff)
downloadnextcloud-server-1c2b2909eb0c92e901e85ece5c8758ffdbf04c8f.tar.gz
nextcloud-server-1c2b2909eb0c92e901e85ece5c8758ffdbf04c8f.zip
Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694
-rw-r--r--lib/user.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/user.php b/lib/user.php
index 55ffc26e77f..2ab580bb2e7 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -372,6 +372,8 @@ class OC_User {
return self::determineDisplayName($user);
} else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
return $_SESSION['display_name'];
+ } else if ( $user = $this->getUser() ) {
+ return self::determineDisplayName($user);
}
else{
return false;