From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- maintenance/mergeMessageFileList.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'maintenance/mergeMessageFileList.php') diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index cea64333..62596b20 100644 --- a/maintenance/mergeMessageFileList.php +++ b/maintenance/mergeMessageFileList.php @@ -82,6 +82,9 @@ class MergeMessageFileList extends Maintenance { if ( $this->hasOption( 'output' ) ) { $mmfl['output'] = $this->getOption( 'output' ); } + if ( $this->hasOption( 'quiet' ) ) { + $mmfl['quiet'] = true; + } } } @@ -92,7 +95,9 @@ foreach ( $mmfl['setupFiles'] as $fileName ) { continue; } $fileName = str_replace( '$IP', $IP, $fileName ); - fwrite( STDERR, "Loading data from $fileName\n" ); + if ( empty( $mmfl['quiet'] ) ) { + fwrite( STDERR, "Loading data from $fileName\n" ); + } include_once( $fileName ); } fwrite( STDERR, "\n" ); @@ -120,4 +125,3 @@ if ( isset( $mmfl['output'] ) ) { } else { echo $s; } - -- cgit v1.2.3-54-g00ecf