From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 5 Jul 2006 12:51:38 +0000 (+0000)
Subject: Fixed SVG bug introduced in 15342
X-Git-Tag: 1.31.0-rc.0~56397
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=13cbb3dd29815b7b85578242beceb8cc0cf0a70c;p=lhc%2Fweb%2Fwiklou.git

Fixed SVG bug introduced in 15342
---

diff --git a/includes/Image.php b/includes/Image.php
index e5b12166ce..185d732a05 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -902,7 +902,7 @@ class Image
 			} else {
 				// Don't render, just return the URL
 				if ( $this->validateThumbParams( $width, $height ) ) {
-					if ( $width == $this->width && $height == $this->height ) {
+					if ( !$this->mustRender() && $width == $this->width && $height == $this->height ) {
 						$url = $this->getURL();
 					} else {
 						list( $isScriptUrl, $url ) = $this->thumbUrl( $width );
@@ -1011,7 +1011,7 @@ class Image
 			return null;
 		}
 
-		if ( $width == $this->width && $height == $this->height ) {
+		if ( !$this->mustRender() && $width == $this->width && $height == $this->height ) {
 			# validateThumbParams (or the user) wants us to return the unscaled image
 			$thumb = new ThumbnailImage( $this->getURL(), $width, $height );
 			wfProfileOut( __METHOD__ );