diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2025-03-08 18:26:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2025-03-08 18:26:01 +0000 |
| commit | 19fa0162243dda7840380a70324f60f21c1d5a3d (patch) | |
| tree | 12cb90cc5f51b8c4bfb0f72bf0b99980f5d7d4d7 /includes/ServiceWiring.php | |
| parent | a4574d7daf75ff4a74501380b7ded69f0d46da17 (diff) | |
| parent | e19c93582a3a75801ec983487c0500133c734686 (diff) | |
| download | mediawikicore-19fa0162243dda7840380a70324f60f21c1d5a3d.tar.gz mediawikicore-19fa0162243dda7840380a70324f60f21c1d5a3d.zip | |
Merge "user: Allow gender to be a global preference"
Diffstat (limited to 'includes/ServiceWiring.php')
| -rw-r--r-- | includes/ServiceWiring.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index b58a73a17c60..e8de4323f6f8 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -239,6 +239,7 @@ use MediaWiki\User\CentralId\CentralIdLookup; use MediaWiki\User\CentralId\CentralIdLookupFactory; use MediaWiki\User\Options\ConditionalDefaultsLookup; use MediaWiki\User\Options\DefaultOptionsLookup; +use MediaWiki\User\Options\StaticUserOptionsLookup; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\Options\UserOptionsManager; use MediaWiki\User\PasswordReset; @@ -898,11 +899,16 @@ return [ 'GenderCache' => static function ( MediaWikiServices $services ): GenderCache { $nsInfo = $services->getNamespaceInfo(); - // Database layer may be disabled, so processing without database connection - $dbLoadBalancer = $services->isServiceDisabled( 'DBLoadBalancer' ) - ? null - : $services->getDBLoadBalancerFactory(); - return new GenderCache( $nsInfo, $dbLoadBalancer, $services->get( '_DefaultOptionsLookup' ) ); + // If there is no database, use defaults + if ( $services->isServiceDisabled( 'DBLoadBalancer' ) ) { + $userOptionsLookup = new StaticUserOptionsLookup( + [], + $services->getMainConfig()->get( MainConfigNames::DefaultUserOptions ) + ); + } else { + $userOptionsLookup = $services->getUserOptionsLookup(); + } + return new GenderCache( $nsInfo, null, $userOptionsLookup ); }, 'GlobalIdGenerator' => static function ( MediaWikiServices $services ): GlobalIdGenerator { @@ -2735,7 +2741,8 @@ return [ $services->getContentLanguageCode(), $services->getHookContainer(), $services->getNamespaceInfo(), - $services->get( '_ConditionalDefaultsLookup' ) + $services->get( '_ConditionalDefaultsLookup' ), + $services->getUserIdentityLookup() ); }, |