Fixed issues in r72940 - missing $ in release notes and remnant of ResourceLoaderUser...

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

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index a649e42..bf0639b 100644 (file)
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -9,6 +9,11 @@
 define( 'DO_MAINTENANCE', dirname( __FILE__ ) . '/doMaintenance.php' );
 $maintClass = false;
 
+function wfRunMaintenance( $class ) {
+       $maintClass = $class;
+       require_once( DO_MAINTENANCE );
+}
+
 // Make sure we're on PHP5 or better
 if ( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) {
        die ( "Sorry! This version of MediaWiki requires PHP 5; you are running " .
@@ -400,7 +405,7 @@ abstract class Maintenance {
                global $IP, $wgCommandLineMode, $wgRequestTime;
 
                # Abort if called from a web server
-               if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
+               if ( isset( $_SERVER ) && isset( $_SERVER['REQUEST_METHOD'] ) ) {
                        $this->error( 'This script must be run from the command line', true );
                }
 
@@ -689,12 +694,10 @@ abstract class Maintenance {
                                $wgLBFactoryConf['serverTemplate']['user'] = $wgDBuser;
                                $wgLBFactoryConf['serverTemplate']['password'] = $wgDBpassword;
                        }
+                       LBFactory::destroyInstance();
                }
 
-               if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
-                       $fn = MW_CMDLINE_CALLBACK;
-                       $fn();
-               }
+               $this->afterFinalSetup();
 
                $wgShowSQLErrors = true;
                @set_time_limit( 0 );
@@ -703,6 +706,15 @@ abstract class Maintenance {
                $wgProfiling = false; // only for Profiler.php mode; avoids OOM errors
        }
 
+       /**
+        * Execute a callback function at the end of initialisation
+        */
+       protected function afterFinalSetup() {
+               if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
+                       call_user_func( MW_CMDLINE_CALLBACK );
+               }
+       }
+
        /**
         * Potentially debug globals. Originally a feature only
         * for refreshLinks