From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 27 Sep 2013 18:36:59 +0000 (-0700)
Subject: Hide filebackend listing exceptions for thumbnail purges
X-Git-Tag: 1.31.0-rc.0~18664^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=64e9b88abf172da8ff5f44c593873d1477138798;p=lhc%2Fweb%2Fwiklou.git

Hide filebackend listing exceptions for thumbnail purges

bug: 54674
Change-Id: I20db9004fc8b5509f7731b1e678efc6f0aed6cdb
---

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 4edcebf7da..d6dc150a58 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -788,10 +788,12 @@ class LocalFile extends File {
 
 		$backend = $this->repo->getBackend();
 		$files = array( $dir );
-		$iterator = $backend->getFileList( array( 'dir' => $dir ) );
-		foreach ( $iterator as $file ) {
-			$files[] = $file;
-		}
+		try {
+			$iterator = $backend->getFileList( array( 'dir' => $dir ) );
+			foreach ( $iterator as $file ) {
+				$files[] = $file;
+			}
+		} catch ( FileBackendError $e ) {} // suppress (bug 54674)
 
 		return $files;
 	}