From c2884b8bd145aa6d45f6eaefe3564e19263fd037 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Tue, 11 Oct 2011 21:28:31 +0000 Subject: [PATCH] Don't reinvent the wheel to do parameter existence checking Stops running the code outside the class when there's no point attempting it --- maintenance/mergeMessageFileList.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 ) { -- 2.20.1