http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88686
Revision: 88686
Author: nelson
Date: 2011-05-23 21:02:05 +0000 (Mon, 23 May 2011)
Log Message:
-----------
Special:MovePage was broken. Isn't anymore.
Modified Paths:
--------------
trunk/extensions/SwiftMedia/SwiftMedia.body.php
Modified: trunk/extensions/SwiftMedia/SwiftMedia.body.php
===================================================================
--- trunk/extensions/SwiftMedia/SwiftMedia.body.php 2011-05-23 21:01:31 UTC
(rev 88685)
+++ trunk/extensions/SwiftMedia/SwiftMedia.body.php 2011-05-23 21:02:05 UTC
(rev 88686)
@@ -2464,7 +2464,7 @@
* @return Either array of files and existence flags, or false
*/
function fileExistsBatch( $files, $flags = 0 ) {
- if (flags != self::FILES_ONLY) {
+ if ($flags != self::FILES_ONLY) {
// we ONLY support when $flags & self::FILES_ONLY is
set!
throw new MWException( 'Swift Media Store doesn\'t have
directories');
}
@@ -2628,17 +2628,15 @@
foreach ( $files as $file ) {
if ( is_array( $file ) ) {
// This is a pair, extract it
- list( $zone, $rel ) = $file;
- $cont = $this->getZonePath( $zone );
+ list( $cont, $rel ) = $file;
} else {
if ( self::isVirtualUrl( $file ) ) {
// This is a virtual url, resolve it
$path = $this->resolveVirtualUrl( $file
);
- list( $zone, $rel) = $path;
- $cont = $this->getZonePath( $zone );
+ list( $cont, $rel) = $path;
} else {
// FIXME: This is a full file name
- throw new MWException( __METHOD__.':
$file' );
+ throw new MWException( __METHOD__.':
$file needs an unlink()' );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
