Avoid calling oldFileFromRowFactory field directly

Change-Id: Ibbd5a8baa27015eec443349a67edc57ede5d174d

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index a410eed..965f677 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -29,11 +29,10 @@
  * @ingroup FileRepo
  */
 class LocalRepo extends FileRepo {
-       public $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' );
-
        protected $fileFactory = array( 'LocalFile', 'newFromTitle' );
        protected $fileFactoryKey = array( 'LocalFile', 'newFromKey' );
        protected $fileFromRowFactory = array( 'LocalFile', 'newFromRow' );
+       protected $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' );
        protected $oldFileFactory = array( 'OldLocalFile', 'newFromTitle' );
        protected $oldFileFactoryKey = array( 'OldLocalFile', 'newFromKey' );
 

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 3c15449..c6ea79f 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -994,11 +994,7 @@ class LocalFile extends File {
                $r = array();
 
                foreach ( $res as $row ) {
-                       if ( $this->repo->oldFileFromRowFactory ) {
-                               $r[] = call_user_func( $this->repo->oldFileFromRowFactory, $row, $this->repo );
-                       } else {
-                               $r[] = OldLocalFile::newFromRow( $row, $this->repo );
-                       }
+                       $r[] = $this->repo->newFileFromRow( $row );
                }
 
                if ( $order == 'ASC' ) {