diff options
author | Andrew Dolgov <[email protected]> | 2015-08-17 07:55:44 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-08-17 07:55:44 +0300 |
commit | 961cae85a4ed14647c3b4a616c3c63873c7bc5e0 (patch) | |
tree | ea4b76c2b6f2c6cdcdf5003837871db0bf8cac90 /include | |
parent | d5eaaa050821a7b07baf932d6ce705f3c67ef334 (diff) | |
parent | 18433c6c1824aa46c8328925f15be95897acadd9 (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
Diffstat (limited to 'include')
-rw-r--r-- | include/functions2.php | 1 | ||||
-rw-r--r-- | include/rssfuncs.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/functions2.php b/include/functions2.php index 6a83a44f2..dd9d1ad68 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1890,6 +1890,7 @@ $rv = $retval; } } + unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below. if ($rv === '' && !empty($result)) { $entries_html = array(); diff --git a/include/rssfuncs.php b/include/rssfuncs.php index a922516cd..7ea0bf0c8 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -1248,6 +1248,8 @@ if ($file_content && strlen($file_content) > _MIN_CACHE_IMAGE_SIZE) { file_put_contents($local_filename, $file_content); } + } else { + touch($local_filename); } } } |