From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 6 Jan 2012 06:35:54 +0000 (+0000)
Subject: r108192: Explicitly set flags for RecursiveDirectoryIterator constructor
X-Git-Tag: 1.31.0-rc.0~25491
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=e2eb4b5065bfabcfb6bb1a03c42b0df102e6ff04;p=lhc%2Fweb%2Fwiklou.git

r108192: Explicitly set flags for RecursiveDirectoryIterator constructor
---

diff --git a/includes/filerepo/backend/FSFileBackend.php b/includes/filerepo/backend/FSFileBackend.php
index f6c7d48138..edaf523b42 100644
--- a/includes/filerepo/backend/FSFileBackend.php
+++ b/includes/filerepo/backend/FSFileBackend.php
@@ -456,7 +456,9 @@ class FSFileIterator implements Iterator {
 	public function __construct( $dir ) {
 		$this->suffixStart = strlen( realpath( $dir ) ) + 1; // size of "path/to/dir/"
 		try {
-			$this->iter = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $dir ) );
+			$flags = FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS;
+			$this->iter = new RecursiveIteratorIterator(
+				new RecursiveDirectoryIterator( $dir, $flags ) );
 		} catch ( UnexpectedValueException $e ) {
 			$this->iter = null; // bad permissions? deleted?
 		}