X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FcommandLine.inc;h=be07142208628aca43035ce0052173608785db8e;hb=cbf385a5238aab782151338d4b955d17565ffab7;hp=e241d5e9312bab49f02681d46afcd7ac089023e6;hpb=ce9228369ff5f9c96eb845eea5898405ef255116;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index e241d5e931..be07142208 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -1,10 +1,32 @@
 <?php
-
 /**
- * Backwards-compatibility wrapper for old-style maintenance scripts
+ * Backwards-compatibility wrapper for old-style maintenance scripts.
+ *
+ * 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
+ *
+ * @file
+ * @ingroup Maintenance
  */
-require( dirname(__FILE__) . '/Maintenance.php' );
-$optionsWithArgs = array();
+
+require_once __DIR__ . '/Maintenance.php';
+
+global $optionsWithArgs;
+if ( !isset( $optionsWithArgs ) ) {
+	$optionsWithArgs = array();
+}
 
 class CommandLineInc extends Maintenance {
 	public function __construct() {
@@ -13,9 +35,16 @@ class CommandLineInc extends Maintenance {
 		foreach ( $optionsWithArgs as $name ) {
 			$this->addOption( $name, '', false, true );
 		}
+	}
 
-		# No help, it would just be misleading since it misses custom options
-		unset( $this->mParams['help'] );
+	/**
+	 * No help, it would just be misleading since it misses custom options
+	 */
+	protected function maybeHelp( $force = false ) {
+		if ( !$force ) {
+			return;
+		}
+		parent::maybeHelp( true );
 	}
 
 	public function execute() {
@@ -26,5 +55,5 @@ class CommandLineInc extends Maintenance {
 }
 
 $maintClass = 'CommandLineInc';
-require( DO_MAINTENANCE );
+require RUN_MAINTENANCE_IF_MAIN;