* (bug 3643) Fix image page display of large images with resizing disabled

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 765aea7..33578f6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -132,6 +132,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Blacklist additional MSIE CSS safety tricks
 * (bug 3332) Installation now uses Monobook, validates, plus usability improvements.
 * (bug 3629) Fix date & time format for Frisian
+* (bug 3643) Fix image page display of large images with resizing disabled
 
 
 === Caveats ===

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 2d9d8c3..1ab1c36 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -174,14 +174,14 @@ class ImagePage extends Article {
                                        if( $wgUseImageResize ) {
                                                $thumbnail = $this->img->getThumbnail( $width );
                                                if ( $thumbnail == null ) {
-                                                       $url = $img->getViewURL();
+                                                       $url = $this->img->getViewURL();
                                                } else {
                                                        $url = $thumbnail->getURL();
                                                }
                                        } else {
                                                # No resize ability? Show the full image, but scale
                                                # it down in the browser so it fits on the page.
-                                               $url = $img->getViewURL();
+                                               $url = $this->img->getViewURL();
                                        }
                                        $anchoropen  = "<a href=\"{$full_url}\">";
                                        $anchorclose = "</a><br />";