Merge "Correctly parse 'redirect' XML tag during Special:Import."

[lhc/web/wiklou.git] / maintenance / doMaintenance.php

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 2b637cb..47e6a89 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -82,8 +82,10 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
                // @todo FIXME: Replace this hack with general farm-friendly code
                # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
                # Maybe a hook?
+               // @codingStandardsIgnoreStart MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
                global $cluster;
                $cluster = 'pmtpa';
+               // @codingStandardsIgnoreEnd
                require "$IP/../wmf-config/wgConf.php";
        }
        // Require the configuration (probably LocalSettings.php)
@@ -91,7 +93,10 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 }
 
 if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
-       if ( $wgLocalisationCacheConf['storeClass'] === false && ( $wgLocalisationCacheConf['store'] == 'db' || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) ) ) {
+       if ( $wgLocalisationCacheConf['storeClass'] === false
+               && ( $wgLocalisationCacheConf['store'] == 'db'
+                       || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) )
+       ) {
                $wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
        }
 }