http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84553
Revision: 84553
Author: aaron
Date: 2011-03-22 20:34:50 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Made FileRepo::newFileFromKey actually work
Modified Paths:
--------------
trunk/phase3/includes/filerepo/FileRepo.php
trunk/phase3/includes/filerepo/LocalRepo.php
Modified: trunk/phase3/includes/filerepo/FileRepo.php
===================================================================
--- trunk/phase3/includes/filerepo/FileRepo.php 2011-03-22 20:34:21 UTC (rev
84552)
+++ trunk/phase3/includes/filerepo/FileRepo.php 2011-03-22 20:34:50 UTC (rev
84553)
@@ -193,12 +193,13 @@
if ( $time ) {
if ( $this->oldFileFactoryKey ) {
return call_user_func(
$this->oldFileFactoryKey, $sha1, $this, $time );
- } else {
- return false;
}
} else {
- return call_user_func( $this->fileFactoryKey, $sha1,
$this );
+ if ( $this->fileFactoryKey ) {
+ return call_user_func( $this->fileFactoryKey,
$sha1, $this );
+ }
}
+ return false;
}
/**
Modified: trunk/phase3/includes/filerepo/LocalRepo.php
===================================================================
--- trunk/phase3/includes/filerepo/LocalRepo.php 2011-03-22 20:34:21 UTC
(rev 84552)
+++ trunk/phase3/includes/filerepo/LocalRepo.php 2011-03-22 20:34:50 UTC
(rev 84553)
@@ -14,7 +14,9 @@
*/
class LocalRepo extends FSRepo {
var $fileFactory = array( 'LocalFile', 'newFromTitle' );
+ var $fileFactoryKey = array( 'LocalFile', 'newFromKey' );
var $oldFileFactory = array( 'OldLocalFile', 'newFromTitle' );
+ var $oldFileFactoryKey = array( 'OldLocalFile', 'newFromKey' );
var $fileFromRowFactory = array( 'LocalFile', 'newFromRow' );
var $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
