Use proper methods for display name retrieval

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
index 25e92d23962faa3d6791b3c9c611b8f084643799..ab8adda725ea154e6642c4f962c91c5b2093a8ef 100644 (file)
--- a/apps/files_sharing/lib/Cache.php
+++ b/apps/files_sharing/lib/Cache.php
@@ -38,6 +38,7 @@ use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchComparison;
 use OCP\Files\Search\ISearchOperator;
 use OCP\Files\StorageNotAvailableException;
+use OCP\IUserManager;
 
 /**
  * Metadata cache for shared files
@@ -174,7 +175,13 @@ class Cache extends CacheJail {
 
        private function getOwnerDisplayName() {
                if (!$this->ownerDisplayName) {
-                       $this->ownerDisplayName = \OC_User::getDisplayName($this->storage->getOwner(''));
+                       $uid = $this->storage->getOwner('');
+                       $user = \OC::$server->get(IUserManager::class)->get($uid);
+                       if ($user) {
+                               $this->ownerDisplayName = $user->getDisplayName();
+                       } else {
+                               $this->ownerDisplayName = $uid;
+                       }
                }
                return $this->ownerDisplayName;
        }

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 82bd0fd22e70338012d4bd775391c66fde8be568..16d4423838bcf378cf40831afe6e1eb55c4e9f44 100644 (file)
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -52,6 +52,7 @@ use OCP\Defaults;
 use OCP\IConfig;
 use OCP\IInitialStateService;
 use OCP\INavigationManager;
+use OCP\IUserSession;
 use OCP\Support\Subscription\IRegistry;
 use OCP\Util;
 
@@ -121,7 +122,12 @@ class TemplateLayout extends \OC_Template {
                                        break;
                                }
                        }
-                       $userDisplayName = \OC_User::getDisplayName();
+
+                       $userDisplayName = false;
+                       $user = \OC::$server->get(IUserSession::class)->getUser();
+                       if ($user) {
+                               $userDisplayName = $user->getDisplayName();
+                       }
                        $this->assign('user_displayname', $userDisplayName);
                        $this->assign('user_uid', \OC_User::getUser());
 
@@ -152,7 +158,11 @@ class TemplateLayout extends \OC_Template {
                        \OC_Util::addStyle('guest');
                        $this->assign('bodyid', 'body-login');
 
-                       $userDisplayName = \OC_User::getDisplayName();
+                       $userDisplayName = false;
+                       $user = \OC::$server->get(IUserSession::class)->getUser();
+                       if ($user) {
+                               $userDisplayName = $user->getDisplayName();
+                       }
                        $this->assign('user_displayname', $userDisplayName);
                        $this->assign('user_uid', \OC_User::getUser());
                } elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {

diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php
index dd97fb63e335cc38ac87a6cfe6d5d1ceb2d0eb43..f955c5c6938aa6ac02b79846f7f0b197b4ba2a2d 100644 (file)
--- a/lib/private/legacy/OC_User.php
+++ b/lib/private/legacy/OC_User.php
@@ -328,32 +328,6 @@ class OC_User {
                }
        }
 
-       /**
-        * get the display name of the user currently logged in.
-        *
-        * @param string $uid
-        * @return string|bool uid or false
-        * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method
-        *                   get() of \OCP\IUserManager - \OC::$server->getUserManager()
-        */
-       public static function getDisplayName($uid = null) {
-               if ($uid) {
-                       $user = \OC::$server->getUserManager()->get($uid);
-                       if ($user) {
-                               return $user->getDisplayName();
-                       } else {
-                               return $uid;
-                       }
-               } else {
-                       $user = \OC::$server->getUserSession()->getUser();
-                       if ($user) {
-                               return $user->getDisplayName();
-                       } else {
-                               return false;
-                       }
-               }
-       }
-
        /**
         * Set password
         *