Fix regression in r52174 where parameter was not passed to MediaWiki:sp-contributions...

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

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 394b0a4..452acf4 100644 (file)
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1,6 +1,7 @@
 <?php
 // Define this so scripts can easily find doMaintenance.php
 define( 'DO_MAINTENANCE', dirname( __FILE__ ) . '/doMaintenance.php' );
+$maintClass = false;
 
 // Make sure we're on PHP5 or better
 if( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) {
@@ -50,13 +51,13 @@ abstract class Maintenance {
        const STDIN_ALL = 'all';
 
        // This is the desired params
-       private $mParams = array();
+       protected $mParams = array();
 
        // Array of desired args
-       private $mArgList = array();
+       protected $mArgList = array();
 
        // This is the list of options that were actually passed
-       private $mOptions = array();
+       protected $mOptions = array();
 
        // This is the list of arguments that were actually passed
        protected $mArgs = array();
@@ -65,14 +66,14 @@ abstract class Maintenance {
        protected $mSelf;
 
        // Special vars for params that are always used
-       private $mQuiet = false;
-       private $mDbUser, $mDbPass;
+       protected $mQuiet = false;
+       protected $mDbUser, $mDbPass;
 
        // A description of the script, children should change this
        protected $mDescription = '';
 
        // Have we already loaded our user input?
-       private $mInputLoaded = false;
+       protected $mInputLoaded = false;
 
        // Batch size. If a script supports this, they should set
        // a default with setBatchSize()
@@ -247,7 +248,7 @@ abstract class Maintenance {
        /**
         * Add the default parameters to the scripts
         */
-       private function addDefaultParams() {
+       protected function addDefaultParams() {
                $this->addOption( 'help', "Display this help message" );
                $this->addOption( 'quiet', "Whether to supress non-error output" );
                $this->addOption( 'conf', "Location of LocalSettings.php, if not default", false, true );
@@ -266,13 +267,13 @@ abstract class Maintenance {
        }
 
        /**
-        * Spawn a child maintenance script. Pass all of the current arguments
+        * Run a child maintenance script. Pass all of the current arguments
         * to it.
         * @param $maintClass String A name of a child maintenance class
         * @param $classFile String Full path of where the child is
         * @return Maintenance child
         */
-       protected function spawnChild( $maintClass, $classFile = null ) {
+       protected function runChild( $maintClass, $classFile = null ) {
                // If we haven't already specified, kill setup procedures
                // for child scripts, we've already got a sane environment
                self::disableSetup();
@@ -332,7 +333,7 @@ abstract class Maintenance {
                }
 
                # Set the memory limit
-               ini_set( 'memory_limit', -1 );
+               ini_set( 'memory_limit', $this->memoryLimit() );
 
                # Set max execution time to 0 (no limit). PHP.net says that
                # "When running PHP from the command line the default setting is 0."
@@ -361,6 +362,15 @@ abstract class Maintenance {
                $this->maybeHelp();
                $this->validateParamsAndArgs();
        }
+       
+       /**
+        * Normally we disable the memory_limit when running admin scripts.
+        * Some scripts may wish to actually set a limit, however, to avoid
+        * blowing up unexpectedly.
+        */
+       public function memoryLimit() {
+               return -1;
+       }
 
        /**
         * Clear all params and arguments.
@@ -443,7 +453,7 @@ abstract class Maintenance {
                                # Short options
                                for ( $p=1; $p<strlen( $arg ); $p++ ) {
                                        $option = $arg{$p};
-                                       if ( $this->mParams[$option]['withArg'] ) {
+                                       if ( isset( $this->mParams[$option]['withArg'] ) && $this->mParams[$option]['withArg'] ) {
                                                $param = next( $argv );
                                                if ( $param === false ) {
                                                        $this->error( "\nERROR: $option needs a value after it\n" );
@@ -468,7 +478,7 @@ abstract class Maintenance {
        /**
         * Run some validation checks on the params, etc
         */
-       private function validateParamsAndArgs() {
+       protected function validateParamsAndArgs() {
                $die = false;
                # Check to make sure we've got all the required options
                foreach( $this->mParams as $opt => $info ) {
@@ -491,7 +501,7 @@ abstract class Maintenance {
        /**
         * Handle the special variables that are global to all scripts
         */
-       private function loadSpecialVars() {
+       protected function loadSpecialVars() {
                if( $this->hasOption( 'dbuser' ) )
                        $this->mDbUser = $this->getOption( 'dbuser' );
                if( $this->hasOption( 'dbpass' ) )
@@ -506,9 +516,9 @@ abstract class Maintenance {
         * Maybe show the help.
         * @param $force boolean Whether to force the help to show, default false
         */
-       private function maybeHelp( $force = false ) {
+       protected function maybeHelp( $force = false ) {
                ksort( $this->mParams );
-               if( $this->hasOption( 'help' ) || in_array( 'help', $this->mArgs ) || $force ) {
+               if( $this->hasOption( 'help' ) || $force ) {
                        $this->mQuiet = false;
                        if( $this->mDescription ) {
                                $this->output( "\n" . $this->mDescription . "\n" );
@@ -753,7 +763,7 @@ abstract class Maintenance {
         * Return all of the core maintenance scripts
         * @return array
         */
-       private static function getCoreScripts() {
+       protected static function getCoreScripts() {
                if( !self::$mCoreScripts ) {
                        self::disableSetup();
                        $paths = array(