Avoid FATAL ERROR when creating thumbnail of non-existing image

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2dac2a0..0ad4ce6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -299,6 +299,7 @@ fully support the editing toolbar, but was found to be too confusing.
   get a blue link even if there's no local description page
 * (bug 4169) Use $wgLegalTitleChars in pipe trick conversions
 * (bug 4170) Decode HTML character escapes in sort key
+* Avoid FATAL ERROR when creating thumbnail of non-existing image
 
 
 === Caveats ===

diff --git a/includes/Linker.php b/includes/Linker.php
index 33d45da..f949637 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -480,6 +480,8 @@ class Linker {
                if ( $img->exists() ) {
                        $width  = $img->getWidth();
                        $height = $img->getHeight();
+               } else {
+                       return $this->makeBrokenLinkObj( $img->getTitle() );
                }
                if ( 0 == $width || 0 == $height ) {
                        $width = $height = 200;