valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 28539f6aaf 8493163576
commit 98b0729850
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/functions2.php
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();