Update output language.

[lhc/web/wiklou.git] / maintenance / doMaintenance.php

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 7547a49..0ed50ba 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -26,20 +26,23 @@
  * @ingroup Maintenance
  */
 
-if ( !defined( 'DO_MAINTENANCE' ) ) {
+if ( !defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
        echo "This file must be included after Maintenance.php\n";
        exit( 1 );
 }
 
+// Wasn't included from the file scope, halt execution (probably wanted the class)
+// If a class is using commandLine.inc (old school maintenance), they definitely
+// cannot be included and will proceed with execution
+if( !Maintenance::shouldExecute() && $maintClass != 'CommandLineInc' ) {
+       return;
+}
+
 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;
-}
-
 // Get an object to start us off
 $maintenance = new $maintClass();
 
@@ -61,16 +64,11 @@ if ( file_exists( "$IP/StartProfiler.php" ) ) {
 // Some other requires
 require_once( "$IP/includes/AutoLoader.php" );
 require_once( "$IP/includes/Defines.php" );
+require_once( "$IP/includes/DefaultSettings.php" );
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
-       require_once( "$IP/includes/DefaultSettings.php" );
-
-       $callback = MW_CONFIG_CALLBACK;
-       if ( strpos( $callback, '::' ) !== false ) {
-               $callback = explode( '::', $callback, 2);
-       }
-       call_user_func( $callback );
+       MWFunction::call( MW_CONFIG_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