http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84506
Revision: 84506
Author: reedy
Date: 2011-03-22 00:24:17 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Followup r84470, fill "MW 1.15 compat"
Modified Paths:
--------------
trunk/phase3/includes/filerepo/FileRepo.php
Modified: trunk/phase3/includes/filerepo/FileRepo.php
===================================================================
--- trunk/phase3/includes/filerepo/FileRepo.php 2011-03-22 00:15:00 UTC (rev
84505)
+++ trunk/phase3/includes/filerepo/FileRepo.php 2011-03-22 00:24:17 UTC (rev
84506)
@@ -105,13 +105,7 @@
* 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 @@
* @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 );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
