Skip to content

Commit ea91e7b

Browse files
committed
Remove the member $languageID from UserRankCache
1 parent 577d6bd commit ea91e7b

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

wcfsetup/install/files/lib/data/user/UserProfile.class.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use wcf\data\user\online\UserOnline;
1919
use wcf\data\user\option\ViewableUserOption;
2020
use wcf\data\user\rank\UserRank;
21-
use wcf\data\user\rank\ViewableUserRank;
2221
use wcf\system\cache\builder\UserGroupPermissionCacheBuilder;
2322
use wcf\system\cache\eager\UserRankCache;
2423
use wcf\system\cache\runtime\FileRuntimeCache;
@@ -930,7 +929,7 @@ public function getUserTitle()
930929
return '';
931930
}
932931

933-
public function getRank(): ?ViewableUserRank
932+
public function getRank(): ?UserRank
934933
{
935934
if (!\MODULE_USER_RANK) {
936935
return null;
@@ -940,7 +939,7 @@ public function getRank(): ?ViewableUserRank
940939
return null;
941940
}
942941

943-
$userRanks = (new UserRankCache(WCF::getLanguage()->languageID))->getCache();
942+
$userRanks = (new UserRankCache())->getCache();
944943

945944
return $userRanks[$this->rankID] ?? null;
946945
}

wcfsetup/install/files/lib/data/user/rank/UserRankEditor.class.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use wcf\data\IEditableCachedObject;
77
use wcf\system\cache\builder\UserRankCacheBuilder;
88
use wcf\system\cache\eager\UserRankCache;
9-
use wcf\system\language\LanguageFactory;
109

1110
/**
1211
* Provides functions to edit user ranks.
@@ -33,8 +32,6 @@ public static function resetCache()
3332
{
3433
UserRankCacheBuilder::getInstance()->reset();
3534

36-
foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
37-
(new UserRankCache($language->languageID))->rebuild();
38-
}
35+
(new UserRankCache())->rebuild();
3936
}
4037
}

wcfsetup/install/files/lib/system/cache/eager/UserRankCache.class.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace wcf\system\cache\eager;
44

5-
use wcf\data\user\rank\ViewableUserRank;
6-
use wcf\data\user\rank\ViewableUserRankList;
5+
use wcf\data\user\rank\UserRank;
6+
use wcf\data\user\rank\UserRankList;
77

88
/**
99
* Eager cache implementation for user ranks.
@@ -13,19 +13,14 @@
1313
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
1414
* @since 6.2
1515
*
16-
* @extends AbstractEagerCache<array<int, ViewableUserRank>>
16+
* @extends AbstractEagerCache<array<int, UserRank>>
1717
*/
1818
final class UserRankCache extends AbstractEagerCache
1919
{
20-
public function __construct(
21-
public readonly int $languageID
22-
) {
23-
}
24-
2520
#[\Override]
2621
protected function getCacheData(): array
2722
{
28-
$userRankList = new ViewableUserRankList($this->languageID);
23+
$userRankList = new UserRankList();
2924
$userRankList->readObjects();
3025

3126
return $userRankList->getObjects();

0 commit comments

Comments
 (0)