| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -530,13 +530,13 @@ |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | // Reduce width for upright images when parameter 'upright' is used |
| 534 | | - if ( !isset( $fp['upright_factor'] ) || $fp['upright_factor'] == 0 ) { |
| 535 | | - $fp['upright_factor'] = $wgThumbUpright; |
| | 534 | + if ( isset( $fp['upright'] ) && $fp['upright'] == 0 ) { |
| | 535 | + $fp['upright'] = $wgThumbUpright; |
| 536 | 536 | } |
| 537 | 537 | // Use width which is smaller: real image width or user preference width |
| 538 | 538 | // For caching health: If width scaled down due to upright parameter, round to full __0 pixel to avoid the creation of a lot of odd thumbs |
| 539 | 539 | $prefWidth = isset( $fp['upright'] ) ? |
| 540 | | - round( $wgThumbLimits[$wopt] * $fp['upright_factor'], -1 ) : |
| | 540 | + round( $wgThumbLimits[$wopt] * $fp['upright'], -1 ) : |
| 541 | 541 | $wgThumbLimits[$wopt]; |
| 542 | 542 | if ( $hp['width'] <= 0 || $prefWidth < $hp['width'] ) { |
| 543 | 543 | $hp['width'] = $prefWidth; |
| — | — | @@ -544,7 +544,7 @@ |
| 545 | 545 | } |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | | - if ( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) ) { |
| | 548 | + if ( isset( $fp['thumbnail'] ) || isset( $fp['manualthumb'] ) || isset( $fp['framed'] ) ) { |
| 549 | 549 | |
| 550 | 550 | # Create a thumbnail. Alignment depends on language |
| 551 | 551 | # writing direction, # right aligned for left-to-right- |