From bf858d0c8ed0b382bc5708974e26950fdf0e8b9b Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 4 May 2012 15:39:30 -0700 Subject: [PATCH] [FileBackend] Removed PHP < 5.3 b/c cruft. Change-Id: Ied29fab9c2582384fd95b76831649f77639a3647 --- includes/filerepo/backend/FSFileBackend.php | 22 +++++++-------------- 1 file changed, 7 insertions(+), 15 deletions(-) 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 + ); } } -- 2.20.1