Merge branch 'master' of github.com:gnuboard/g4s

2013-04-15 17:29:41 +09:00
parent 8b6d038d69 5a8c8cf9e0
commit 1117ac3ff8
1 changed files with 5 additions and 0 deletions
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@ -213,8 +213,13 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
        $src = imagecreatefromjpeg($source_file);
    } else if ($size[2] == 3) {
        $src = imagecreatefrompng($source_file);
+    } else {
+        return;
    }

+    if(!$src)
+        return;
+
    $src_width = $size[0];
    $src_height = $size[1];