Made FileRepo::newFileFromKey actually work

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 4ad6af5..defb67d 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -193,12 +193,13 @@ abstract class FileRepo {
                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;
        }
 
        /**

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index e72f32b..662dfd9 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -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' );