* Fix empty file histories

* Fix Media: links to image redirects

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 0d20799..b722903 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -411,7 +411,7 @@ EOT
 
                $sk = $wgUser->getSkin();
 
-               if ( $this->img ) {
+               if ( $this->img->exists ) {
                        $list = new ImageHistoryList( $sk, $this->img );
                        $file = $this->img;
                        $dims = $file->getDimensionsString();

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 92aa9e5..8601881 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -89,6 +89,10 @@ class LocalRepo extends FSRepo {
                if( !$wgFileRedirects ) {
                        return false;
                }
+
+               if( $title->getNamespace() == NS_MEDIA ) {
+                       $title = Title::makeTitle( NS_IMAGE, $title->getText() );
+               }
                
                $id = $this->getArticleID( $title );
                if( !$id ) {