From: OverlordQ <overlordq@users.mediawiki.org>
Date: Wed, 3 Feb 2010 06:21:25 +0000 (+0000)
Subject: Fix for not being able to override thumbnail height
X-Git-Tag: 1.31.0-rc.0~37961
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=0071dd7375031a3f598c0db35527021c142dc735;p=lhc%2Fweb%2Fwiklou.git

Fix for not being able to override thumbnail height
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 5d1f09686a..be2cc90aa5 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -468,7 +468,7 @@ class Linker {
 		if ( $file && !isset( $hp['width'] ) ) {
 			$hp['width'] = $file->getWidth( $page );
 
-			if( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) || !$hp['width'] ) {
+			if( ( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) ) && !$hp['height'] ) {
 				$wopt = $wgUser->getOption( 'thumbsize' );
 
 				if( !isset( $wgThumbLimits[$wopt] ) ) {