* (bug 3127) Render large SVGs at image page size correctly

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2c2ac85..a393d3c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -90,6 +90,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3063) Remove some hardcodings from Hebrew localisation
 * Support SVG rendering with rsvg
 * Cap arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide
 * (bug 3063) Remove some hardcodings from Hebrew localisation
 * Support SVG rendering with rsvg
 * Cap arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide

+* (bug 3127) Render large SVGs at image page size correctly

 
 
 === Caveats ===
 
 
 === Caveats ===

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 33c3c9c..c056c47 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -168,8 +168,7 @@ class ImagePage extends Article {
                                        $width = floor( $width * $maxHeight / $height );
                                        $height = $maxHeight;
                                }
                                        $width = floor( $width * $maxHeight / $height );
                                        $height = $maxHeight;
                                }

-                               if ( !$this->img->mustRender()
-                                  && ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) ) {
+                               if ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) {

                                        if( $wgUseImageResize ) {
                                                $thumbnail = $this->img->getThumbnail( $width );
                                                if ( $thumbnail == null ) {
                                        if( $wgUseImageResize ) {
                                                $thumbnail = $this->img->getThumbnail( $width );
                                                if ( $thumbnail == null ) {