Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov 2015-08-17 07:55:44 +03:00
commit 961cae85a4
6 changed files with 482 additions and 1067 deletions

View file

@ -1890,6 +1890,7 @@
$rv = $retval; $rv = $retval;
} }
} }
unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
if ($rv === '' && !empty($result)) { if ($rv === '' && !empty($result)) {
$entries_html = array(); $entries_html = array();

View file

@ -1248,6 +1248,8 @@
if ($file_content && strlen($file_content) > _MIN_CACHE_IMAGE_SIZE) { if ($file_content && strlen($file_content) > _MIN_CACHE_IMAGE_SIZE) {
file_put_contents($local_filename, $file_content); file_put_contents($local_filename, $file_content);
} }
} else {
touch($local_filename);
} }
} }
} }

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff