diff options
author | Andrew Dolgov <[email protected]> | 2015-08-15 09:35:11 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-08-15 09:35:11 +0300 |
commit | 98b0729850d36f07d12661d91b06b8057a4e3aed (patch) | |
tree | cf41b2a991d7536804bbb2575eed7c19af1a1f64 /include | |
parent | 28539f6aafba872c5ca4ab3266357664b8b39a6b (diff) | |
parent | 8493163576feed8a978a6525d6d4567d2ed2cc4c (diff) |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/functions2.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/functions2.php b/include/functions2.php index b4018453e..445e9e022 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(); |