diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/photo/photo_driver.php | 3 | ||||
| -rw-r--r-- | include/text.php | 3 |
2 files changed, 5 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']); diff --git a/include/text.php b/include/text.php index 9635925b5..c6980c5f8 100644 --- a/include/text.php +++ b/include/text.php @@ -3751,6 +3751,9 @@ function get_forum_channels($uid) { intval($uid) ); + if(!$r) + $r = []; + for($x = 0; $x < count($r); $x ++) { if($x3) { foreach($x3 as $xx) { |