From: Alex Monk <krenair@gmail.com>
Date: Wed, 3 Feb 2016 22:58:53 +0000 (+0000)
Subject: Register importImages options without arguments as actual maintenance script options... 
X-Git-Tag: 1.31.0-rc.0~7571^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=b4d5a97c3bdef95bf669692509771aab7034b5dd;p=lhc%2Fweb%2Fwiklou.git

Register importImages options without arguments as actual maintenance script options so they are usable

Change-Id: Ia3ba7ed221a4cf7fcf78a6c64f5a59109a1b886d
---

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index e871a4e863..206e04677b 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -25,20 +25,27 @@ require_once __DIR__ . '/Maintenance.php';
 
 // @codingStandardsIgnoreStart MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
 global $optionsWithArgs;
+global $optionsWithoutArgs;
 // @codingStandardsIgnoreEnd
 if ( !isset( $optionsWithArgs ) ) {
 	$optionsWithArgs = [];
 }
+if ( !isset( $optionsWithoutArgs ) ) {
+	$optionsWithoutArgs = [];
+}
 
 class CommandLineInc extends Maintenance {
 	public function __construct() {
 		// @codingStandardsIgnoreStart MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
-		global $optionsWithArgs;
+		global $optionsWithArgs, $optionsWithoutArgs;
 		// @codingStandardsIgnoreEnd
 		parent::__construct();
 		foreach ( $optionsWithArgs as $name ) {
 			$this->addOption( $name, '', false, true );
 		}
+		foreach ( $optionsWithoutArgs as $name ) {
+			$this->addOption( $name, '', false, false );
+		}
 	}
 
 	/**
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index f0c6569ace..512c38cb32 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -36,6 +36,12 @@ $optionsWithArgs = [
 	'extensions', 'comment', 'comment-file', 'comment-ext', 'summary', 'user',
 	'license', 'sleep', 'limit', 'from', 'source-wiki-url', 'timestamp',
 ];
+
+$optionsWithoutArgs = [
+	'protect', 'unprotect', 'search-recursively', 'check-userblock', 'overwrite',
+	'skip-dupes', 'dry'
+];
+
 require_once __DIR__ . '/commandLine.inc';
 require_once __DIR__ . '/importImages.inc';
 $processed = $added = $ignored = $skipped = $overwritten = $failed = 0;