Bug 3116: Division by zero on [[Image:Foo.png|123x123px|]]

See Bug 3129

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69057f4..8b04c37 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,8 @@ Misc work going on.....
 * (bug 2323) Remove "last" tabindex from history page
 * (bug 3141) Partial support for Breton language (thanks Fulup).
 * Partial support for Basque language (from wikipedia and meta)
+* (bug 3116) Division by zero on [[Image:Foo.png|123x123px|]]
+
 
 === Caveats ===
 

diff --git a/includes/Linker.php b/includes/Linker.php
index d4e99d8..81c290c 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -419,8 +419,9 @@ class Linker {
                        }
                        
                        return $prefix.$this->makeThumbLinkObj( $img, $label, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
+               }
 
-               } elseif ( $width ) {
+               if ( $width && $img->exists() ) {
 
                        # Create a resized image, without the additional thumbnail
                        # features

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index 40fef6a..5fda2be 100644 (file)
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -236,7 +236,7 @@ class WikiExporter {
        function pageByName( $name ) {
                $title = Title::newFromText( $name );
                if( is_null( $title ) ) {
-                       return WikiError( "Can't export invalid title" );
+                       return new WikiError( "Can't export invalid title" );
                } else {
                        return $this->pageByTitle( $title );
                }