From: Tim Starling <tstarling@wikimedia.org>
Date: Thu, 31 Jan 2013 05:35:19 +0000 (+1100)
Subject: Respect --quiet in mergeMessageFileList.php
X-Git-Tag: 1.31.0-rc.0~20817^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=672caa9c4c41f9244e7733b324d66ddbc89f91dc;p=lhc%2Fweb%2Fwiklou.git

Respect --quiet in mergeMessageFileList.php

To go with Ic6db1d8a

Change-Id: I95cbd4c6f47fe741da93c7d3260196cce5f29275
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index cea64333c2..dd189f43cc 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" );