Merge "Get file from WikiFilePage, instead of ImagePage"

diff --git a/includes/page/ImageHistoryList.php b/includes/page/ImageHistoryList.php
index 32638a5..4c36729 100644 (file)
--- a/includes/page/ImageHistoryList.php
+++ b/includes/page/ImageHistoryList.php
@@ -53,7 +53,7 @@ class ImageHistoryList extends ContextSource {
         */
        public function __construct( $imagePage ) {
                global $wgShowArchiveThumbnails;
-               $this->current = $imagePage->getFile();
+               $this->current = $imagePage->getPage()->getFile();
                $this->img = $imagePage->getDisplayedFile();
                $this->title = $imagePage->getTitle();
                $this->imagePage = $imagePage;

diff --git a/includes/page/ImageHistoryPseudoPager.php b/includes/page/ImageHistoryPseudoPager.php
index e421d23..f541387 100644 (file)
--- a/includes/page/ImageHistoryPseudoPager.php
+++ b/includes/page/ImageHistoryPseudoPager.php
@@ -111,7 +111,7 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
                if ( $this->mQueryDone ) {
                        return;
                }
-               $this->mImg = $this->mImagePage->getFile(); // ensure loading
+               $this->mImg = $this->mImagePage->getPage()->getFile(); // ensure loading
                if ( !$this->mImg->exists() ) {
                        return;
                }