From: Aaron <aschulz@wikimedia.org>
Date: Fri, 4 May 2012 22:39:30 +0000 (-0700)
Subject: [FileBackend] Removed PHP < 5.3 b/c cruft.
X-Git-Tag: 1.31.0-rc.0~23731
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=bf858d0c8ed0b382bc5708974e26950fdf0e8b9b;p=lhc%2Fweb%2Fwiklou.git

[FileBackend] Removed PHP < 5.3 b/c cruft.

Change-Id: Ied29fab9c2582384fd95b76831649f77639a3647
---

diff --git a/includes/filerepo/backend/FSFileBackend.php b/includes/filerepo/backend/FSFileBackend.php
index 23077b7e7a..d7649c5c28 100644
--- a/includes/filerepo/backend/FSFileBackend.php
+++ b/includes/filerepo/backend/FSFileBackend.php
@@ -635,21 +635,13 @@ abstract class FSFileBackendList implements Iterator {
 			return new DirectoryIterator( $dir );
 		} else { // recursive
 			# Get an iterator that will return leaf nodes (non-directories)
-			if ( MWInit::classExists( 'FilesystemIterator' ) ) { // PHP >= 5.3
-				# RecursiveDirectoryIterator extends FilesystemIterator.
-				# FilesystemIterator::SKIP_DOTS default is inconsistent in PHP 5.3.x.
-				$flags = FilesystemIterator::CURRENT_AS_SELF | FilesystemIterator::SKIP_DOTS;
-				return new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator( $dir, $flags ),
-					RecursiveIteratorIterator::CHILD_FIRST // include dirs
-				);
-			} else { // PHP < 5.3
-				# RecursiveDirectoryIterator extends DirectoryIterator
-				return new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator( $dir ),
-					RecursiveIteratorIterator::CHILD_FIRST // include dirs
-				);
-			}
+			# RecursiveDirectoryIterator extends FilesystemIterator.
+			# FilesystemIterator::SKIP_DOTS default is inconsistent in PHP 5.3.x.
+			$flags = FilesystemIterator::CURRENT_AS_SELF | FilesystemIterator::SKIP_DOTS;
+			return new RecursiveIteratorIterator(
+				new RecursiveDirectoryIterator( $dir, $flags ),
+				RecursiveIteratorIterator::CHILD_FIRST // include dirs
+			);
 		}
 	}