Avoid warning because $a isn't called by reference

[friendica.git] / include / Photo.php

diff --git a/include/Photo.php b/include/Photo.php
index 91fce55a86f868c4959291618fa4b8af77c4bba6..d87bce478704fccb6489097269e2e83163a4fd5f 100644 (file)
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -823,9 +823,12 @@ function get_photo_info($url) {
 
        $data = Cache::get($url);
 
-       if (is_null($data)) {
-               $img_str = fetch_url($url, true, $redirects, 4);
+       // Unserialise to be able to check in the next step if the cached data is alright.
+       if (!is_null($data))
+               $data = unserialize($data);
 
+       if (is_null($data) OR !$data) {
+               $img_str = fetch_url($url, true, $redirects, 4);
                $filesize = strlen($img_str);
 
                if (function_exists("getimagesizefromstring"))
@@ -846,8 +849,7 @@ function get_photo_info($url) {
                        $data["size"] = $filesize;
 
                Cache::set($url, serialize($data));
-       } else
-               $data = unserialize($data);
+       }
 
        return $data;
 }