X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FimportImages.php;h=ac700ef010be3b3b55057c0ba1faaa2a3a7ba524;hb=937e602c2c56f068272f635c5867d69f00f9ef49;hp=f0c6569acef95708e522f6b75fd9b9f4dfa345bb;hpb=734ca2b4d2a1246fb0ea1e54b861ab423ab5e257;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index f0c6569ace..ac700ef010 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;
@@ -251,7 +257,7 @@ if ( $count > 0 ) {
 			$archive = $image->publish( $file, $flags, $publishOptions );
 			if ( !$archive->isGood() ) {
 				echo "failed. (" .
-					$archive->getWikiText() .
+					$archive->getWikiText( false, false, 'en' ) .
 					")\n";
 				$failed++;
 				continue;
@@ -291,8 +297,8 @@ if ( $count > 0 ) {
 
 			if ( $doProtect ) {
 				# Protect the file
-				echo "\nWaiting for slaves...\n";
-				// Wait for slaves.
+				echo "\nWaiting for replica DBs...\n";
+				// Wait for replica DBs.
 				sleep( 2.0 ); # Why this sleep?
 				wfWaitForSlaves();