| Index: trunk/tools/mwmultiversion/maintenance.diff |
| — | — | @@ -1,39 +0,0 @@ |
| 2 | | -Index: doMaintenance.php |
| 3 | | -=================================================================== |
| 4 | | -+++ doMaintenance.php (working copy) |
| 5 | | -@@ -74,7 +74,7 @@ |
| 6 | | - if ( defined( 'MW_CONFIG_CALLBACK' ) ) { |
| 7 | | - # Use a callback function to configure MediaWiki |
| 8 | | - MWFunction::call( MW_CONFIG_CALLBACK ); |
| 9 | | --} elseif ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) { |
| 10 | | -+} elseif ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) { |
| 11 | | - // Load settings, using wikimedia-mode if needed |
| 12 | | - // @todo FIXME: Replace this hack with general farm-friendly code |
| 13 | | - # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext |
| 14 | | -@@ -82,9 +82,9 @@ |
| 15 | | - global $cluster; |
| 16 | | - $cluster = 'pmtpa'; |
| 17 | | - require_once( MWInit::compiledPath( 'includes/SiteConfiguration.php' ) ); |
| 18 | | -- require( MWInit::interpretedPath( 'wmf-config/wgConf.php' ) ); |
| 19 | | -+ require( MWInit::interpretedPath( '/../wmf-config/wgConf.php' ) ); |
| 20 | | - $maintenance->loadWikimediaSettings(); |
| 21 | | -- require( MWInit::interpretedPath( '/wmf-config/CommonSettings.php' ) ); |
| 22 | | -+ require( MWInit::interpretedPath( '/../wmf-config/CommonSettings.php' ) ); |
| 23 | | - } else { |
| 24 | | - require_once( $maintenance->loadSettings() ); |
| 25 | | - } |
| 26 | | -Index: Maintenance.php |
| 27 | | -=================================================================== |
| 28 | | -+++ Maintenance.php (working copy) |
| 29 | | -@@ -915,7 +915,9 @@ |
| 30 | | - $wgUseNormalUser = true; |
| 31 | | - } |
| 32 | | - |
| 33 | | -+ putenv( 'MW_DBNAME=' . $db ); |
| 34 | | - putenv( 'wikilang=' . $lang ); |
| 35 | | -+ putenv( 'wikisite=' . $site ); |
| 36 | | - |
| 37 | | - ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" ); |
| 38 | | - |