* (bug 4167) Fix regression caused by patch for bug 153

New code didn't check for null thumbnail (deleted or nonexistent images)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 843c5eb..671e7c7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -294,6 +294,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 4165) Correct validation for user language selection (data taint)
 * Add createpage and createtalk permission keys, allowing a quick
   switch to disable page creation for anonymous users.
+* (bug 4167) Fix regression caused by patch for bug 153
 
 
 === Caveats ===

diff --git a/includes/Linker.php b/includes/Linker.php
index d9cd2b6..4ffca4f 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -500,12 +500,11 @@ class Linker {
                                $boxheight = -1;
                        if ( '' == $manual_thumb ) {
                                $thumb = $img->getThumbnail( $boxwidth, $boxheight );
-                               if ( is_null( $thumb ) ) {
-                                       return '<b>FATAL ERROR: Thumb object NULL in Linker.php:504</b>';
+                               if ( $thumb ) {
+                                       $thumbUrl = $thumb->getUrl();
+                                       $boxwidth = $thumb->width;
+                                       $boxheight = $thumb->height;
                                }
-                               $thumbUrl = $thumb->getUrl();
-                               $boxwidth = $thumb->width;
-                               $boxheight = $thumb->height;
                        }
                }
                $oboxwidth = $boxwidth + 2;