From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 27 Jan 2012 14:33:43 +0000 (+0000)
Subject: Self-revert r110124, needs more than that to support 5.2 since $flags don't exist... 
X-Git-Tag: 1.31.0-rc.0~25059
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=e98e89099f1009ffbec7c4e7f015a6ec0918326a;p=lhc%2Fweb%2Fwiklou.git

Self-revert r110124, needs more than that to support 5.2 since $flags don't exist in 5.2.

Either this needs to be fixed to really support 5.2 or we'll bumping the minimum version to 5.3 this release.
---

diff --git a/includes/filerepo/backend/FSFileBackend.php b/includes/filerepo/backend/FSFileBackend.php
index d0ff92c3f2..6a9b3059e6 100644
--- a/includes/filerepo/backend/FSFileBackend.php
+++ b/includes/filerepo/backend/FSFileBackend.php
@@ -22,14 +22,6 @@ g<?php
  * @since 1.19
  */
 class FSFileBackend extends FileBackend {
-
-	/**
-	 * These constants are the same as the ones in FilesystemIterator, but
-	 * that's only 5.3+ so copy them here. When we drop 5.2 we can remove this
-	 */
-	const CURRENT_AS_FILEINFO = 0;
-	const SKIP_DOTS = 4096;
-	
 	protected $basePath; // string; directory holding the container directories
 	/** @var Array Map of container names to root paths */
 	protected $containerPaths = array(); // for custom container paths
@@ -556,7 +548,7 @@ class FSFileBackendFileList implements Iterator {
 		$dir = realpath( $dir ); // normalize
 		$this->suffixStart = strlen( $dir ) + 1; // size of "path/to/dir/"
 		try {
-			$flags = self::CURRENT_AS_FILEINFO | self::SKIP_DOTS;
+			$flags = FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS;
 			$this->iter = new RecursiveIteratorIterator(
 				new RecursiveDirectoryIterator( $dir, $flags ) );
 		} catch ( UnexpectedValueException $e ) {