Don't create thumbnail images larger than the image; use the source image

itself if asked. Reject attempts at zero or negative-width thumbs.

diff --git a/includes/Image.php b/includes/Image.php
index 27ad21e..ed69912 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -103,6 +103,17 @@ class Image
                        # If there is no image, there will be no thumbnail
                        return "";
                }
+               
+               # Sanity check $width
+               $width = IntVal( $width );
+               if( $width <= 0 ) {
+                       # BZZZT
+                       return "";
+               }
+               if( $width > $this->width ) {
+                       # Don't make an image bigger than the source
+                       return $this->getURL();
+               }
 
                if (    (! file_exists( $thumbPath ) )
                     || ( filemtime($thumbPath) < filemtime($this->imagePath) ) ) {