| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -108,6 +108,7 @@ |
| 109 | 109 | if ( !is_array( $options ) ) { |
| 110 | 110 | // MW 1.15 compat |
| 111 | 111 | $time = $options; |
| | 112 | + $options = array(); |
| 112 | 113 | } else { |
| 113 | 114 | $time = isset( $options['time'] ) ? $options['time'] : false; |
| 114 | 115 | } |
| — | — | @@ -218,6 +219,7 @@ |
| 219 | 220 | if ( !is_array( $options ) ) { |
| 220 | 221 | # MW 1.15 compat |
| 221 | 222 | $time = $options; |
| | 223 | + $options = array(); |
| 222 | 224 | } else { |
| 223 | 225 | $time = isset( $options['time'] ) ? $options['time'] : false; |
| 224 | 226 | } |
| Index: trunk/phase3/includes/filerepo/README |
| — | — | @@ -39,3 +39,21 @@ |
| 40 | 40 | database access and higher-level functions such as cache management. |
| 41 | 41 | |
| 42 | 42 | Tim Starling, June 2007 |
| | 43 | + |
| | 44 | +Structure: |
| | 45 | + |
| | 46 | +File.php defines an abstract class File. |
| | 47 | + ForeignAPIFile.php extends File. |
| | 48 | + LocalFile.php extends File. |
| | 49 | + ForeignDBFile.php extends LocalFile |
| | 50 | + Image.php extends LocalFile |
| | 51 | + UnregisteredLocalFile.php extends File. |
| | 52 | +FileRepo.php defined an abstract class FileRepo. |
| | 53 | + ForeignAPIRepo.php extends FileRepo |
| | 54 | + FSRepo extends FileRepo |
| | 55 | + LocalRepo.php extends FSRepo |
| | 56 | + ForeignDBRepo.php extends LocalRepo |
| | 57 | + ForeignDBViaLBRepo.php extends LocalRepo |
| | 58 | + NullRepo extends FileRepo |
| | 59 | + |
| | 60 | +Russ Nelson, March 2011 |
| Index: trunk/phase3/includes/filerepo/RepoGroup.php |
| — | — | @@ -344,7 +344,7 @@ |
| 345 | 345 | */ |
| 346 | 346 | function splitVirtualUrl( $url ) { |
| 347 | 347 | if ( substr( $url, 0, 9 ) != 'mwrepo://' ) { |
| 348 | | - throw new MWException( __METHOD__.': unknown protoocl' ); |
| | 348 | + throw new MWException( __METHOD__.': unknown protocol' ); |
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | $bits = explode( '/', substr( $url, 9 ), 3 ); |