dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
51dcadd
)
Stupid merge conflicts, fix r96537
author
Chad Horohoe
<demon@users.mediawiki.org>
Thu, 8 Sep 2011 01:54:27 +0000
(
01:54
+0000)
committer
Chad Horohoe
<demon@users.mediawiki.org>
Thu, 8 Sep 2011 01:54:27 +0000
(
01:54
+0000)
maintenance/doMaintenance.php
patch
|
blob
|
history
diff --git
a/maintenance/doMaintenance.php
b/maintenance/doMaintenance.php
index
0fe8140
..
6b29c5f
100644
(file)
--- a/
maintenance/doMaintenance.php
+++ b/
maintenance/doMaintenance.php
@@
-85,10
+85,8
@@
if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) );
}
// Require the configuration (probably LocalSettings.php)
- require(
MWInit::interpretedPath( $maintenance->loadSettings()
) );
+ require(
$maintenance->loadSettings(
) );
}
-// Require the configuration (probably LocalSettings.php)
-require( $maintenance->loadSettings() );
if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
is_readable( "$IP/AdminSettings.php" ) )