| Index: trunk/extensions/SwiftMedia/SwiftMedia.body.php |
| — | — | @@ -2464,7 +2464,7 @@ |
| 2465 | 2465 | * @return Either array of files and existence flags, or false |
| 2466 | 2466 | */ |
| 2467 | 2467 | function fileExistsBatch( $files, $flags = 0 ) { |
| 2468 | | - if (flags != self::FILES_ONLY) { |
| | 2468 | + if ($flags != self::FILES_ONLY) { |
| 2469 | 2469 | // we ONLY support when $flags & self::FILES_ONLY is set! |
| 2470 | 2470 | throw new MWException( 'Swift Media Store doesn\'t have directories'); |
| 2471 | 2471 | } |
| — | — | @@ -2628,17 +2628,15 @@ |
| 2629 | 2629 | foreach ( $files as $file ) { |
| 2630 | 2630 | if ( is_array( $file ) ) { |
| 2631 | 2631 | // This is a pair, extract it |
| 2632 | | - list( $zone, $rel ) = $file; |
| 2633 | | - $cont = $this->getZonePath( $zone ); |
| | 2632 | + list( $cont, $rel ) = $file; |
| 2634 | 2633 | } else { |
| 2635 | 2634 | if ( self::isVirtualUrl( $file ) ) { |
| 2636 | 2635 | // This is a virtual url, resolve it |
| 2637 | 2636 | $path = $this->resolveVirtualUrl( $file ); |
| 2638 | | - list( $zone, $rel) = $path; |
| 2639 | | - $cont = $this->getZonePath( $zone ); |
| | 2637 | + list( $cont, $rel) = $path; |
| 2640 | 2638 | } else { |
| 2641 | 2639 | // FIXME: This is a full file name |
| 2642 | | - throw new MWException( __METHOD__.': $file' ); |
| | 2640 | + throw new MWException( __METHOD__.': $file needs an unlink()' ); |
| 2643 | 2641 | } |
| 2644 | 2642 | } |
| 2645 | 2643 | |