From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 10 Sep 2005 23:01:27 +0000 (+0000)
Subject: * (bug 3127) Render large SVGs at image page size correctly
X-Git-Tag: 1.6.0~1682
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=3d3ebe821621b47fb3faaf49cc199e074f3c7368;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2c2ac857d8..a393d3c6e2 100644
--- 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 3127) Render large SVGs at image page size correctly
 
 
 === Caveats ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 33c3c9cf96..c056c47bf7 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -168,8 +168,7 @@ class ImagePage extends Article {
 					$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 ) {