Merge pull request #50 from annando/master

[friendica.git] / mod / photo.php

diff --git a/mod/photo.php b/mod/photo.php
old mode 100644 (file)
new mode 100755 (executable)
index 3994620..c4a9376
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -119,7 +119,7 @@ function photo_init(&$a) {
                // NOTREACHED
        }
 
-       if(intval($customres) && $customres > 0 && $customres < 500) {
+       if(isset($customres) && $customres > 0 && $customres < 500) {
                require_once('include/Photo.php');
                $ph = new Photo($data);
                if($ph->is_valid()) {
@@ -128,7 +128,14 @@ function photo_init(&$a) {
                }
        }
 
+       if(function_exists('header_remove')) {
+               header_remove('Pragma');
+               header_remove('pragma');
+       }
+
        header("Content-type: image/jpeg");
+       header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+       header("Cache-Control: max-age=" . (3600*24));
        echo $data;
        killme();
        // NOTREACHED