1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-21 04:31:28 +00:00

Merge branch 'enclosures-render-patch' into 'master'

Unset $retval after HOOK_FORMAT_ENCLOSURES.

Fixes an edge case where changing the array of enclosures with HOOK_FORMAT_ENCLOSURES might break the dropdown rendering if HOOK_RENDER_ENCLOSURE has no registered hooks.

See merge request !6
This commit is contained in:
Andrew Dolgov
2015-08-15 09:35:11 +03:00

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();