adjust method comment for Ia19f1011

[lhc/web/wiklou.git] / maintenance / mergeMessageFileList.php

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index a914202..8669fe3 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -31,7 +31,8 @@ $mmfl = false;
 class MergeMessageFileList extends Maintenance {
 
        function __construct() {
-               $this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', false, true );
+               parent::__construct();
+               $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.';
@@ -39,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 ) {
@@ -55,7 +52,7 @@ class MergeMessageFileList extends Maintenance {
        }
 }
 
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 
 foreach ( $mmfl['setupFiles'] as $fileName ) {
        if ( strval( $fileName ) === '' ) {
@@ -70,8 +67,7 @@ $s =
        "<" . "?php\n" .
        "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" .
        "if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" .
-       '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
-       '$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n";
+       '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n";
 
 $dirs = array(
        $IP,