Make use of the new cache

diff --git a/wcfsetup/install/files/lib/data/user/UserProfile.class.php b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
index 2b37f1c79b3aeff33c690b9e5147738f2135b34e..9c355ac02e1025ee4403d230d6484364c3f25ef1 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserProfile.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
@@ -19,6 +19,7 @@ use wcf\data\user\online\UserOnline;
 use wcf\data\user\option\ViewableUserOption;
 use wcf\data\user\rank\UserRank;
 use wcf\system\cache\builder\UserGroupPermissionCacheBuilder;
+use wcf\system\cache\builder\UserRankCacheBuilder;
 use wcf\system\cache\runtime\UserProfileRuntimeCache;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\email\Mailbox;
@@ -79,6 +80,7 @@ class UserProfile extends DatabaseObjectDecorator implements ITitledLinkObject
     /**
      * user rank object
      * @var UserRank
+     * @deprecated 6.1 use `->getRank()` instead
      */
     protected $rank;
 
@@ -925,42 +927,17 @@ class UserProfile extends DatabaseObjectDecorator implements ITitledLinkObject
         return '';
     }
 
-    /**
-     * Returns the user rank.
-     *
-     * @return  UserRank
-     */
-    public function getRank()
+    public function getRank(): ?UserRank
     {
-        if ($this->rank === null) {
-            if (MODULE_USER_RANK && $this->rankID) {
-                if ($this->rankTitle) {
-                    $this->rank = new UserRank(null, [
-                        'rankID' => $this->rankID,
-                        'groupID' => $this->groupID,
-                        'requiredPoints' => $this->requiredPoints,
-                        'rankTitle' => $this->rankTitle,
-                        'cssClassName' => $this->cssClassName,
-                        'rankImage' => $this->rankImage,
-                        'repeatImage' => $this->repeatImage,
-                        'requiredGender' => $this->requiredGender,
-                        'hideTitle' => $this->hideTitle,
-                    ]);
-                } else {
-                    // load storage data
-                    $data = UserStorageHandler::getInstance()->getField('userRank', $this->userID);
+        if (!\MODULE_USER_RANK) {
+            return null;
+        }
 
-                    if ($data === null) {
-                        $this->rank = new UserRank($this->rankID);
-                        UserStorageHandler::getInstance()->update($this->userID, 'userRank', \serialize($this->rank));
-                    } else {
-                        $this->rank = \unserialize($data);
-                    }
-                }
-            }
+        if (!$this->rankID) {
+            return null;
         }
 
-        return $this->rank;
+        return UserRankCacheBuilder::getInstance()->getRank($this->rankID);
     }
 
     /**