dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "MagicWord: Fix an indent"
[lhc/web/wiklou.git]
/
maintenance
/
doMaintenance.php
diff --git
a/maintenance/doMaintenance.php
b/maintenance/doMaintenance.php
index
978d44f
..
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?
// @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';
global $cluster;
$cluster = 'pmtpa';
+ // @codingStandardsIgnoreEnd
require "$IP/../wmf-config/wgConf.php";
}
// Require the configuration (probably LocalSettings.php)
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 ( $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';
}
}
$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}
}
@@
-99,9
+104,6
@@
$maintenance->finalSetup();
// Some last includes
require_once "$IP/includes/Setup.php";
// Some last includes
require_once "$IP/includes/Setup.php";
-// Much much faster startup than creating a title object
-$wgTitle = null;
-
// Do the work
try {
$maintenance->execute();
// Do the work
try {
$maintenance->execute();