From c5c83e77460d244ee4f72f540e7e62b86e8f3e01 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Tue, 22 Mar 2011 00:24:17 +0000 Subject: [PATCH] Followup r84470, fill "MW 1.15 compat" --- includes/filerepo/FileRepo.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) 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 ); -- 2.20.1