| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -105,13 +105,7 @@ |
| 106 | 106 | * be found. |
| 107 | 107 | */ |
| 108 | 108 | function findFile( $title, $options = array() ) { |
| 109 | | - if ( !is_array( $options ) ) { |
| 110 | | - // MW 1.15 compat |
| 111 | | - $time = $options; |
| 112 | | - $options = array(); |
| 113 | | - } else { |
| 114 | | - $time = isset( $options['time'] ) ? $options['time'] : false; |
| 115 | | - } |
| | 109 | + $time = isset( $options['time'] ) ? $options['time'] : false; |
| 116 | 110 | if ( !($title instanceof Title) ) { |
| 117 | 111 | $title = Title::makeTitleSafe( NS_FILE, $title ); |
| 118 | 112 | if ( !is_object( $title ) ) { |
| — | — | @@ -216,13 +210,7 @@ |
| 217 | 211 | * @param $options Option array, same as findFile(). |
| 218 | 212 | */ |
| 219 | 213 | function findFileFromKey( $sha1, $options = array() ) { |
| 220 | | - if ( !is_array( $options ) ) { |
| 221 | | - # MW 1.15 compat |
| 222 | | - $time = $options; |
| 223 | | - $options = array(); |
| 224 | | - } else { |
| 225 | | - $time = isset( $options['time'] ) ? $options['time'] : false; |
| 226 | | - } |
| | 214 | + $time = isset( $options['time'] ) ? $options['time'] : false; |
| 227 | 215 | |
| 228 | 216 | # First try the current version of the file to see if it precedes the timestamp |
| 229 | 217 | $img = $this->newFileFromKey( $sha1 ); |