diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
| commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
| tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /maintenance/doMaintenance.php | |
| parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) | |
Update to MediaWiki 1.19.0
Diffstat (limited to 'maintenance/doMaintenance.php')
| -rw-r--r-- | maintenance/doMaintenance.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index 44e00032..6b29c5fd 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -74,18 +74,18 @@ require_once( MWInit::compiledPath( 'includes/DefaultSettings.php' ) ); if ( defined( 'MW_CONFIG_CALLBACK' ) ) { # Use a callback function to configure MediaWiki MWFunction::call( MW_CONFIG_CALLBACK ); -} elseif ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) { - // Load settings, using wikimedia-mode if needed - // @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? - global $cluster; - $cluster = 'pmtpa'; - require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); - $maintenance->loadWikimediaSettings(); - require( MWInit::interpretedPath( '../wmf-config/CommonSettings.php' ) ); } else { - require_once( $maintenance->loadSettings() ); + if ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) { + // Load settings, using wikimedia-mode if needed + // @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? + global $cluster; + $cluster = 'pmtpa'; + require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); + } + // Require the configuration (probably LocalSettings.php) + require( $maintenance->loadSettings() ); } if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && |