block: Use dbdomain to check for local in BlockUtilsFactory
There are small different on postgres when comparing wiki id and db domain: 'postgres-unittest_' vs. 'postgres-mediawiki-unittest_' The factories for blocks - DatabaseBlockStoreFactory - BlockRestrictionStoreFactory - BlockUtilsFactory should do the same check for consistency Follow-Up: I46699071bbdbbde650061dece6b67a0c58444523 Change-Id: Idf20e7b3624c686ec87cc1d3b07baa6e9735b8ee
This commit is contained in:
parent
cab3f6e305
commit
ca5c8d9b76
2 changed files with 11 additions and 4 deletions
|
|
@ -429,7 +429,8 @@ return [
|
|||
$services->getMainConfig()
|
||||
),
|
||||
$services->getActorStoreFactory(),
|
||||
$services->getUserNameUtils()
|
||||
$services->getUserNameUtils(),
|
||||
$services->getDBLoadBalancerFactory()
|
||||
);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace MediaWiki\Block;
|
|||
use MediaWiki\Config\ServiceOptions;
|
||||
use MediaWiki\User\ActorStoreFactory;
|
||||
use MediaWiki\User\UserNameUtils;
|
||||
use MediaWiki\WikiMap\WikiMap;
|
||||
use Wikimedia\Rdbms\LBFactory;
|
||||
|
||||
/**
|
||||
* @since 1.42
|
||||
|
|
@ -47,21 +47,27 @@ class BlockUtilsFactory {
|
|||
/** @var BlockUtils[] */
|
||||
private $storeCache;
|
||||
|
||||
/** @var LBFactory */
|
||||
private $loadBalancerFactory;
|
||||
|
||||
/**
|
||||
* @param ServiceOptions $options
|
||||
* @param ActorStoreFactory $actorStoreFactory
|
||||
* @param UserNameUtils $userNameUtils
|
||||
* @param LBFactory $loadBalancerFactory
|
||||
*/
|
||||
public function __construct(
|
||||
ServiceOptions $options,
|
||||
ActorStoreFactory $actorStoreFactory,
|
||||
UserNameUtils $userNameUtils
|
||||
UserNameUtils $userNameUtils,
|
||||
LBFactory $loadBalancerFactory
|
||||
) {
|
||||
$options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
|
||||
|
||||
$this->options = $options;
|
||||
$this->actorStoreFactory = $actorStoreFactory;
|
||||
$this->userNameUtils = $userNameUtils;
|
||||
$this->loadBalancerFactory = $loadBalancerFactory;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -69,7 +75,7 @@ class BlockUtilsFactory {
|
|||
* @return BlockUtils
|
||||
*/
|
||||
public function getBlockUtils( $wikiId = Block::LOCAL ): BlockUtils {
|
||||
if ( is_string( $wikiId ) && WikiMap::getCurrentWikiId() === $wikiId ) {
|
||||
if ( is_string( $wikiId ) && $this->loadBalancerFactory->getLocalDomainID() === $wikiId ) {
|
||||
$wikiId = Block::LOCAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue