X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FdoMaintenance.php;h=794776decf4781a00b3ffed2367d2fcad69f9b24;hb=532baa51d9a25858bffb27d023970b5163f0fdd4;hp=dbb03529bb283bdc57257331c2bbd3a333a172b0;hpb=59b60fc31194b3b09bba2c95b8ddf85c3f9e81bb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index dbb03529bb..794776decf 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -2,17 +2,41 @@
 /**
  * We want to make this whole thing as seamless as possible to the
  * end-user. Unfortunately, we can't do _all_ of the work in the class
- * because A) included files are not in global scope, but in the scope 
+ * because A) included files are not in global scope, but in the scope
  * of their caller, and B) MediaWiki has way too many globals. So instead
  * we'll kinda fake it, and do the requires() inline. <3 PHP
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @author Chad Horohoe <chad@anyonecanedit.org>
+ * @file
+ * @ingroup Maintenance
  */
 
-if( !isset( $maintClass ) || !class_exists( $maintClass ) ) {
-	echo "\$maintClass is not set or is set to a non-existent class.";
-	die();
+if ( !defined( 'DO_MAINTENANCE' ) ) {
+	echo "This file must be included after Maintenance.php\n";
+	exit( 1 );
 }
 
-if( defined( 'MW_NO_SETUP' ) ) {
+if ( !$maintClass || !class_exists( $maintClass ) ) {
+	echo "\$maintClass is not set or is set to a non-existent class.\n";
+	exit( 1 );
+}
+
+if ( defined( 'MW_NO_SETUP' ) ) {
 	return;
 }
 
@@ -22,39 +46,69 @@ $maintenance = new $maintClass();
 // Basic sanity checks and such
 $maintenance->setup();
 
+// We used to call this variable $self, but it was moved
+// to $maintenance->mSelf. Keep that here for b/c
+$self = $maintenance->getName();
+
 # Setup the profiler
+global $IP;
 if ( file_exists( "$IP/StartProfiler.php" ) ) {
 	require_once( "$IP/StartProfiler.php" );
 } else {
 	require_once( "$IP/includes/ProfilerStub.php" );
 }
 
-// Load settings, using wikimedia-mode if needed
-if( file_exists( dirname(__FILE__).'/wikimedia-mode' ) ) {
+// Some other requires
+require_once( "$IP/includes/AutoLoader.php" );
+require_once( "$IP/includes/Defines.php" );
+
+if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
+	# Use a callback function to configure MediaWiki
+	require_once( "$IP/includes/DefaultSettings.php" );
+
+	$callback = MW_CONFIG_CALLBACK;
+	# PHP 5.1 doesn't support "class::method" for call_user_func, so split it
+	if ( strpos( $callback, '::' ) !== false ) {
+		$callback = explode( '::', $callback, 2 );
+	}
+	call_user_func( $callback );
+} elseif ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
+	// Load settings, using wikimedia-mode if needed
+	// 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;
 	$wgWikiFarm = true;
-	$cluster = 'pmtma';
-	require_once( "$IP/includes/AutoLoader.php" );
+	$cluster = 'pmtpa';
 	require_once( "$IP/includes/SiteConfiguration.php" );
-	require( "$IP/wgConf.php" );
+	require( "$IP/wmf-config/wgConf.php" );
 	$maintenance->loadWikimediaSettings();
-	require( $IP.'/includes/Defines.php' );
-	require( $IP.'/CommonSettings.php' );
+	require( $IP . '/wmf-config/CommonSettings.php' );
 } else {
-	require_once( "$IP/includes/AutoLoader.php" );
-	require_once( "$IP/includes/Defines.php" );
 	require_once( $maintenance->loadSettings() );
 }
+
+if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
+		is_readable( "$IP/AdminSettings.php" ) )
+{
+	require( "$IP/AdminSettings.php" );
+}
+$maintenance->finalSetup();
 // Some last includes
 require_once( "$IP/includes/Setup.php" );
-require_once( "$IP/install-utils.inc" );
+require_once( "$IP/maintenance/install-utils.inc" );
 
-$wgTitle = null; # Much much faster startup than creating a title object
+// Much much faster startup than creating a title object
+$wgTitle = null;
 
+// Do the work
 try {
 	$maintenance->execute();
-} catch( MWException $mwe ) {
+
+	// Potentially debug globals
+	$maintenance->globals();
+} catch ( MWException $mwe ) {
 	echo( $mwe->getText() );
-}
\ No newline at end of file
+	exit( 1 );
+}
+