From 00b4bfcbf56e29c905355fc8b4fea71b4075c8ee Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 3 Jun 2013 13:15:42 +0200
Subject: [PATCH] User: remove determineDisplayName
---
lib/user.php | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/lib/user.php b/lib/user.php
index a8b642a1630..a57ee5b13ca 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -274,22 +274,6 @@ class OC_User {
}
}
-
- /**
- * @brief get display name
- * @param $uid The username
- * @return string display name or uid if no display name is defined
- *
- */
- private static function determineDisplayName($uid) {
- $user = self::getManager()->get($uid);
- if ($user) {
- return $user->getDisplayName();
- } else {
- return $uid;
- }
- }
-
/**
* @brief Logs the current user out and kills all the session data
*
@@ -342,11 +326,17 @@ class OC_User {
/**
* @brief get the display name of the user currently logged in.
+ * @param string $uid
* @return string uid or false
*/
- public static function getDisplayName($user = null) {
- if ($user) {
- return self::determineDisplayName($user);
+ public static function getDisplayName($uid = null) {
+ if ($uid) {
+ $user = self::getManager()->get($uid);
+ if ($user) {
+ return $user->getDisplayName();
+ } else {
+ return $uid;
+ }
} else {
$user = self::getUserSession()->getUser();
if ($user) {
--
GitLab