diff options
| -rw-r--r-- | lib/public/user.php | 4 | ||||
| -rw-r--r-- | lib/user.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/public/user.php b/lib/public/user.php index a93e3a674a8..411098ed5aa 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -56,8 +56,8 @@ class User { * @brief get the user display name of the user currently logged in.
* @return string display name
*/
- public static function getDisplayName() {
- return \OC_USER::getDisplayName();
+ public static function getDisplayName($user=null) {
+ return \OC_USER::getDisplayName($user);
} /**
diff --git a/lib/user.php b/lib/user.php index 4cdf07dc3ff..65f899aa27c 100644 --- a/lib/user.php +++ b/lib/user.php @@ -350,8 +350,10 @@ class OC_User { * @brief get the display name of the user currently logged in.
* @return string uid or false
*/
- public static function getDisplayName() {
- if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
+ public static function getDisplayName($user=null) { + if ( $user ) { + return self::determineDisplayName($user); + } else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
return $_SESSION['display_name'];
}
else{
|