output queue (merges the old deliverq and queue and adds some zotness)

2012-10-17 16:18:36 -07:00
parent cdeb43f987
commit a680eb3a73
3 changed files with 20 additions and 2 deletions
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -622,7 +622,7 @@ function guess_image_type($filename, $fromcurl=false) {
    }
    if (is_null($type)){
        // Guessing from extension? Isn't that... dangerous?
-        if(class_exists('Imagick')) {
+        if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
            /**
             * Well, this not much better,
             * but at least it comes from the data inside the image,