aboutsummaryrefslogtreecommitdiffstats
path: root/include/photo/photo_driver.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/photo/photo_driver.php')
-rw-r--r--include/photo/photo_driver.php3
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']);