From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 22 Mar 2011 00:24:17 +0000 (+0000)
Subject: Followup r84470, fill "MW 1.15 compat"
X-Git-Tag: 1.31.0-rc.0~31257
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=c5c83e77460d244ee4f72f540e7e62b86e8f3e01;p=lhc%2Fweb%2Fwiklou.git

Followup r84470, fill "MW 1.15 compat"
---

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 7314e116dd..4ad6af573b 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -105,13 +105,7 @@ abstract class FileRepo {
 	 *                     be found.
 	 */
 	function findFile( $title, $options = array() ) {
-		if ( !is_array( $options ) ) {
-			// MW 1.15 compat
-			$time = $options;
-			$options = array();
-		} else {
-			$time = isset( $options['time'] ) ? $options['time'] : false;
-		}
+		$time = isset( $options['time'] ) ? $options['time'] : false;
 		if ( !($title instanceof Title) ) {
 			$title = Title::makeTitleSafe( NS_FILE, $title );
 			if ( !is_object( $title ) ) {
@@ -216,13 +210,7 @@ abstract class FileRepo {
 	 * @param $options Option array, same as findFile().
 	 */
 	function findFileFromKey( $sha1, $options = array() ) {
-		if ( !is_array( $options ) ) {
-			# MW 1.15 compat
-			$time = $options;
-			$options = array();
-		} else {
-			$time = isset( $options['time'] ) ? $options['time'] : false;
-		}
+		$time = isset( $options['time'] ) ? $options['time'] : false;
 
 		# First try the current version of the file to see if it precedes the timestamp
 		$img = $this->newFileFromKey( $sha1 );