diff options
| author | Mario <mario@mariovavti.com> | 2021-03-25 14:00:49 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-25 14:00:49 +0100 |
| commit | b50f1657c3e5772dd6235ce98c55e71630b0c626 (patch) | |
| tree | ad1d7b2b00d012163de2163f9d5902f21618a2de /include/photo/photo_driver.php | |
| parent | bc1cc65ff20c97db0323d02ab652b239b4c60eb6 (diff) | |
| parent | 19b96e37fb2a0fe89e2b6ae537781007bb392532 (diff) | |
| download | volse-hubzilla-b50f1657c3e5772dd6235ce98c55e71630b0c626.tar.gz volse-hubzilla-b50f1657c3e5772dd6235ce98c55e71630b0c626.tar.bz2 volse-hubzilla-b50f1657c3e5772dd6235ce98c55e71630b0c626.zip | |
Merge branch 'air' of https://framagit.org/hubzilla/core into air
Diffstat (limited to 'include/photo/photo_driver.php')
| -rw-r--r-- | include/photo/photo_driver.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 8de5185af..256369c69 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -239,7 +239,7 @@ function import_xchan_photo($photo, $xchan, $thing = false, $force = false) { if($force || empty($modified)) $result = z_fetch_url($photo, true); - elseif($exp - 60 < time()) { + else { $h = []; $h[] = "If-Modified-Since: " . gmdate("D, d M Y H:i:s", $exp) . " GMT"; if(! empty($etag)) @@ -247,6 +247,7 @@ function import_xchan_photo($photo, $xchan, $thing = false, $force = false) { $result = z_fetch_url($photo, true, 0, [ 'headers' => $h ]); } + if(isset($result)) { $hdrs = []; $h = explode("\n", $result['header']); |