Merge "Add CollationFa"

[lhc/web/wiklou.git] / includes / site / DBSiteStore.php

diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php
index c1c10c2..e5247f2 100644 (file)
--- a/includes/site/DBSiteStore.php
+++ b/includes/site/DBSiteStore.php
@@ -40,11 +40,6 @@ class DBSiteStore implements SiteStore {
         */
        private $dbLoadBalancer;
 
-       /**
-        * @var string[]
-        */
-       private $languageCodeMapping = [];
-
        /**
         * @since 1.27
         *
@@ -78,7 +73,7 @@ class DBSiteStore implements SiteStore {
        protected function loadSites() {
                $this->sites = new SiteList();
 
-               $dbr = $this->dbLoadBalancer->getConnection( DB_SLAVE );
+               $dbr = $this->dbLoadBalancer->getConnection( DB_REPLICA );
 
                $res = $dbr->select(
                        'sites',
@@ -101,17 +96,15 @@ class DBSiteStore implements SiteStore {
                );
 
                foreach ( $res as $row ) {
-                       $languageCode = $row->site_language === '' ? null : $row->site_language;
-                       if ( isset( $this->languageCodeMapping[ $languageCode ] ) ) {
-                               $languageCode = $this->languageCodeMapping[ $languageCode ];
-                       }
-
                        $site = Site::newForType( $row->site_type );
                        $site->setGlobalId( $row->site_global_key );
                        $site->setInternalId( (int)$row->site_id );
                        $site->setForward( (bool)$row->site_forward );
                        $site->setGroup( $row->site_group );
-                       $site->setLanguageCode( $languageCode );
+                       $site->setLanguageCode( $row->site_language === ''
+                               ? null
+                               : $row->site_language
+                       );
                        $site->setSource( $row->site_source );
                        $site->setExtraData( unserialize( $row->site_data ) );
                        $site->setExtraConfig( unserialize( $row->site_config ) );
@@ -137,8 +130,6 @@ class DBSiteStore implements SiteStore {
                                $this->sites->setSite( $site );
                        }
                }
-
-               $this->dbLoadBalancer->reuseConnection( $dbr );
        }
 
        /**
@@ -256,8 +247,6 @@ class DBSiteStore implements SiteStore {
 
                $dbw->endAtomic( __METHOD__ );
 
-               $this->dbLoadBalancer->reuseConnection( $dbw );
-
                $this->reset();
 
                return $success;
@@ -287,20 +276,9 @@ class DBSiteStore implements SiteStore {
                $ok = $dbw->delete( 'site_identifiers', '*', __METHOD__ ) && $ok;
                $dbw->endAtomic( __METHOD__ );
 
-               $this->dbLoadBalancer->reuseConnection( $dbw );
-
                $this->reset();
 
                return $ok;
        }
 
-       /**
-        * Provide an array that maps language codes
-        *
-        * @param string[] $newMapping
-        */
-       public function setLanguageCodeMapping( array $newMapping ) {
-               $this->languageCodeMapping = $newMapping;
-       }
-
 }