From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 3 Oct 2012 20:34:30 +0000 (-0700)
Subject: [FileBackend] Suppress less warnings in doGetFileContentsMulti().
X-Git-Tag: 1.31.0-rc.0~22176^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=54f73622d85b8bd3e42ac375b5ab93d129b9c67b;p=lhc%2Fweb%2Fwiklou.git

[FileBackend] Suppress less warnings in doGetFileContentsMulti().

Change-Id: I7c03b4204bc2173c73e11ca9091907f17e93d586
---

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 4271c4a814..a29816f068 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -667,11 +667,11 @@ abstract class FileBackendStore extends FileBackend {
 	 */
 	protected function doGetFileContentsMulti( array $params ) {
 		$contents = array();
-		wfSuppressWarnings();
 		foreach ( $this->doGetLocalReferenceMulti( $params ) as $path => $fsFile ) {
+			wfSuppressWarnings();
 			$contents[$path] = $fsFile ? file_get_contents( $fsFile->getPath() ) : false;
+			wfRestoreWarnings();
 		}
-		wfRestoreWarnings();
 		return $contents;
 	}