Use addDescription() instead of accessing mDescription directly

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

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 43fa460..20b333e 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -51,8 +51,9 @@ class MergeMessageFileList extends Maintenance {
                );
                $this->addOption( 'extensions-dir', 'Path where extensions can be found.', false, true );
                $this->addOption( 'output', 'Send output to this file (omit for stdout)', false, true );
-               $this->mDescription = 'Merge $wgExtensionMessagesFiles and $wgMessagesDirs from ' .
-                       ' various extensions to produce a single file listing all message files and dirs.';
+               $this->addDescription( 'Merge $wgExtensionMessagesFiles and $wgMessagesDirs from ' .
+                       ' various extensions to produce a single file listing all message files and dirs.'
+               );
        }
 
        public function execute() {
@@ -173,10 +174,8 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
        // Using extension.json or skin.json
        if ( substr( $fileName, -strlen( '.json' ) ) === '.json' ) {
                $queue[$fileName] = 1;
-       } elseif ( !( include_once $fileName ) ) {
-               // Include the extension to update $wgExtensionMessagesFiles
-               fwrite( STDERR, "Unable to read $fileName\n" );
-               exit( 1 );
+       } else {
+               require_once $fileName;
        }
 }