Merge pull request #927 from annando/master

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
index 93db82a6418c9dc789e9678c7be505340c7330be..434193f71318edc6b9b63abac8feefb8d95a6b4c 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -106,7 +106,7 @@ function photo_init(&$a) {
                        intval($resolution)
                );
                if(count($r)) {
-                       
+
                        $sql_extra = permissions_sql($r[0]['uid']);
 
                        // Now we'll see if we can access the photo
@@ -169,10 +169,13 @@ function photo_init(&$a) {
                }
        }
 
-       if(isset($customres) && $customres > 0 && $customres < 500) {
+       // Resize only if its not a GIF
+       if ($mime != "image/gif") {
                $ph = new Photo($data, $mimetype);
                if($ph->is_valid()) {
-                       $ph->scaleImageSquare($customres);
+                       if(isset($customres) && $customres > 0 && $customres < 500) {
+                               $ph->scaleImageSquare($customres);
+                       }
                        $data = $ph->imageString();
                        $mimetype = $ph->getType();
                }
@@ -203,9 +206,15 @@ function photo_init(&$a) {
        echo $data;
 
        // If the photo is public and there is an existing photo directory store the photo there
-       if ($public and ($file != ""))
+       if ($public and ($file != "")) {
+               // If the photo path isn't there, try to create it
+               if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
+                       if (is_writable($_SERVER["DOCUMENT_ROOT"]))
+                               mkdir($_SERVER["DOCUMENT_ROOT"]."/photo");
+
                if (is_dir($_SERVER["DOCUMENT_ROOT"]."/photo"))
                        file_put_contents($_SERVER["DOCUMENT_ROOT"]."/photo/".$file, $data);
+       }
 
        killme();
        // NOTREACHED