MediaWiki 1.17.0

[autoinstalls/mediawiki.git] / includes / filerepo / LocalRepo.php

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 6c4d21a26ccd8853853d1e079f9d7fa3dcfefd6b..02883c53c592a122c75085afca531ba4e2b889c3 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Local repository that stores files in the local filesystem and registers them
+ * in the wiki's own database.
+ *
+ * @file
+ * @ingroup FileRepo
+ */
+
 /**
  * A repository that stores files in the local filesystem and registers them
  * in the wiki's own database. This is the most commonly used repository class.
@@ -6,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' );
 
@@ -71,7 +81,7 @@ class LocalRepo extends FSRepo {
        /**
         * Checks if there is a redirect named as $title
         *
-        * @param Title $title Title of image
+        * @param $title Title of file
         */
        function checkRedirect( $title ) {
                global $wgMemc;
@@ -156,9 +166,11 @@ class LocalRepo extends FSRepo {
                );
                
                $result = array();
-               while ( $row = $res->fetchObject() )
+               foreach ( $res as $row ) {
                        $result[] = $this->newFileFromRow( $row );
+               }
                $res->free();
+
                return $result;
        }
 
@@ -189,8 +201,8 @@ class LocalRepo extends FSRepo {
        /**
         * Invalidates image redirect cache related to that image
         *
-        * @param Title $title Title of image
-        */     
+        * @param $title Title of page
+        */
        function invalidateImageRedirect( $title ) {
                global $wgMemc;
                $memcKey = $this->getSharedCacheKey( 'image_redirect', md5( $title->getDBkey() ) );