[Pkg-owncloud-commits] [owncloud] 02/83: Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 5.0
in repository owncloud.

commit 1c2b2909eb0c92e901e85ece5c8758ffdbf04c8f
Author: Nico Kaiser <nico at kaiser.me>
Date:   Fri Oct 11 21:41:04 2013 +0200

    Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694
---
 lib/user.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/user.php b/lib/user.php
index 55ffc26..2ab580b 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git