| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -500,12 +500,11 @@ |
| 501 | 501 | $boxheight = -1; |
| 502 | 502 | if ( '' == $manual_thumb ) { |
| 503 | 503 | $thumb = $img->getThumbnail( $boxwidth, $boxheight ); |
| 504 | | - if ( is_null( $thumb ) ) { |
| 505 | | - return '<b>FATAL ERROR: Thumb object NULL in Linker.php:504</b>'; |
| | 504 | + if ( $thumb ) { |
| | 505 | + $thumbUrl = $thumb->getUrl(); |
| | 506 | + $boxwidth = $thumb->width; |
| | 507 | + $boxheight = $thumb->height; |
| 506 | 508 | } |
| 507 | | - $thumbUrl = $thumb->getUrl(); |
| 508 | | - $boxwidth = $thumb->width; |
| 509 | | - $boxheight = $thumb->height; |
| 510 | 509 | } |
| 511 | 510 | } |
| 512 | 511 | $oboxwidth = $boxwidth + 2; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -294,6 +294,7 @@ |
| 295 | 295 | * (bug 4165) Correct validation for user language selection (data taint) |
| 296 | 296 | * Add createpage and createtalk permission keys, allowing a quick |
| 297 | 297 | switch to disable page creation for anonymous users. |
| | 298 | +* (bug 4167) Fix regression caused by patch for bug 153 |
| 298 | 299 | |
| 299 | 300 | |
| 300 | 301 | === Caveats === |