Add isCurrentWikiId()/isCurrentWikiDomain()/getCurrentWikiDomain() to WikiMap

[lhc/web/wiklou.git] / includes / filebackend / lockmanager / LockManagerGroup.php

diff --git a/includes/filebackend/lockmanager/LockManagerGroup.php b/includes/filebackend/lockmanager/LockManagerGroup.php
index e6f992c..b8fb7fd 100644 (file)
--- a/includes/filebackend/lockmanager/LockManagerGroup.php
+++ b/includes/filebackend/lockmanager/LockManagerGroup.php
@@ -50,7 +50,10 @@ class LockManagerGroup {
         * @return LockManagerGroup
         */
        public static function singleton( $domain = false ) {
-               $domain = ( $domain === false ) ? wfWikiID() : $domain;
+               if ( $domain === false ) {
+                       $domain = WikiMap::getCurrentWikiDomain()->getId();
+               }
+
                if ( !isset( self::$instances[$domain] ) ) {
                        self::$instances[$domain] = new self( $domain );
                        self::$instances[$domain]->initFromGlobals();
@@ -116,7 +119,7 @@ class LockManagerGroup {
                if ( !isset( $this->managers[$name]['instance'] ) ) {
                        $class = $this->managers[$name]['class'];
                        $config = $this->managers[$name]['config'];
-                       if ( $class === 'DBLockManager' ) {
+                       if ( $class === DBLockManager::class ) {
                                $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
                                $lb = $lbFactory->newMainLB( $config['domain'] );
                                $dbw = $lb->getLazyConnectionRef( DB_MASTER, [], $config['domain'] );