From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 11 Oct 2011 21:28:31 +0000 (+0000)
Subject: Don't reinvent the wheel to do parameter existence checking
X-Git-Tag: 1.31.0-rc.0~27136
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/voir.php?a=commitdiff_plain;h=c2884b8bd145aa6d45f6eaefe3564e19263fd037;p=lhc%2Fweb%2Fwiklou.git

Don't reinvent the wheel to do parameter existence checking

Stops running the code outside the class when there's no point attempting it
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 8cfefcbd7e..5ef31cad70 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -32,7 +32,7 @@ class MergeMessageFileList extends Maintenance {
 
 	function __construct() {
 		parent::__construct();
-		$this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', false, true );
+		$this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', true, true );
 		$this->addOption( 'output', 'Send output to this file (omit for stdout)', false, true );
 		$this->mDescription = 'Merge $wgExtensionMessagesFiles from various extensions to produce a ' .
 			'single array containing all message files.';
@@ -40,10 +40,6 @@ class MergeMessageFileList extends Maintenance {
 
 	public function execute() {
 		global $mmfl;
-		if ( !$this->hasOption( 'list-file' ) ) {
-			$this->error( 'The --list-file option must be specified.' );
-			return;
-		}
 
 		$lines = file( $this->getOption( 'list-file' ) );
 		if ( $lines === false ) {