| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -468,7 +468,7 @@ |
| 469 | 469 | if ( $file && !isset( $hp['width'] ) ) { |
| 470 | 470 | $hp['width'] = $file->getWidth( $page ); |
| 471 | 471 | |
| 472 | | - if( ( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) ) && !$hp['height'] ) { |
| | 472 | + if( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) ) { |
| 473 | 473 | $wopt = $wgUser->getOption( 'thumbsize' ); |
| 474 | 474 | |
| 475 | 475 | if( !isset( $wgThumbLimits[$wopt] ) ) { |
| — | — | @@ -485,7 +485,9 @@ |
| 486 | 486 | round( $wgThumbLimits[$wopt] * $fp['upright'], -1 ) : |
| 487 | 487 | $wgThumbLimits[$wopt]; |
| 488 | 488 | if ( $hp['width'] <= 0 || $prefWidth < $hp['width'] ) { |
| 489 | | - $hp['width'] = $prefWidth; |
| | 489 | + if( !isset( $hp['height'] ) ) { |
| | 490 | + $hp['width'] = $prefWidth; |
| | 491 | + } |
| 490 | 492 | } |
| 491 | 493 | } |
| 492 | 494 | } |