X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStorage%2FNameTableStore.php;h=88f301aee9c118c4328c88dab66668941928b96f;hb=398d8e843a72c39c21f6c74e4f43fda413858a13;hp=a14e339020912906322d539370cc207913029d58;hpb=b8c5ec5999af9a79e090a5052b949f7c3ac9c471;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Storage/NameTableStore.php b/includes/Storage/NameTableStore.php
index a14e339020..88f301aee9 100644
--- a/includes/Storage/NameTableStore.php
+++ b/includes/Storage/NameTableStore.php
@@ -66,7 +66,7 @@ class NameTableStore {
 	/**
 	 * @param ILoadBalancer $dbLoadBalancer A load balancer for acquiring database connections
 	 * @param WANObjectCache $cache A cache manager for caching data. This can be the local
-	 *        wiki's default instance even if $wikiId refers to a different wiki, since
+	 *        wiki's default instance even if $dbDomain refers to a different wiki, since
 	 *        makeGlobalKey() is used to constructed a key that allows cached names from
 	 *        the same database to be re-used between wikis. For example, enwiki and frwiki will
 	 *        use the same cache keys for names from the wikidatawiki database, regardless
@@ -111,7 +111,7 @@ class NameTableStore {
 	 * @return IDatabase
 	 */
 	private function getDBConnection( $index, $flags = 0 ) {
-		return $this->loadBalancer->getConnection( $index, [], $this->domain, $flags );
+		return $this->loadBalancer->getConnectionRef( $index, [], $this->domain, $flags );
 	}
 
 	/**
@@ -160,10 +160,7 @@ class NameTableStore {
 			if ( $id === null ) {
 				// RACE: $name was already in the db, probably just inserted, so load from master.
 				// Use DBO_TRX to avoid missing inserts due to other threads or REPEATABLE-READs.
-				// ...but not during unit tests, because we need the fake DB tables of the default
-				// connection.
-				$connFlags = defined( 'MW_PHPUNIT_TEST' ) ? 0 : ILoadBalancer::CONN_TRX_AUTOCOMMIT;
-				$table = $this->reloadMap( $connFlags );
+				$table = $this->reloadMap( ILoadBalancer::CONN_TRX_AUTOCOMMIT );
 
 				$searchResult = array_search( $name, $table, true );
 				if ( $searchResult === false ) {