diff options
| author | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
| commit | bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6 (patch) | |
| tree | 8929845be585b09d0f420621281c5531e1efad3e /include/feedutils.php | |
| parent | 6f93d9848c43019d43ea76c27d42d657ba031cd7 (diff) | |
| parent | fdefa101d84dc2a9424eaedbdb003a4c30ec5d01 (diff) | |
| download | volse-hubzilla-5.0.tar.gz volse-hubzilla-5.0.tar.bz2 volse-hubzilla-5.0.zip | |
Merge branch '5.0RC'5.0
Diffstat (limited to 'include/feedutils.php')
| -rw-r--r-- | include/feedutils.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index 6d14eb5c4..0a9af7ee1 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -155,7 +155,7 @@ function get_feed_for($channel, $observer_hash, $params) { if($item['item_private']) continue; - $atom .= atom_entry($item, $type, null, $owner, true, '', $params['compat']); + $atom .= atom_entry($item, $type, null, $channel, true, '', $params['compat']); } } @@ -452,6 +452,7 @@ function get_atom_elements($feed, $item) { else { $res['title'] = bbcode($res['title'], [ 'tryoembed' => false ]); $res['title'] = html2plain($res['title'], 0, true); + $res['title'] = strip_tags($res['title']); $res['title'] = html_entity_decode($res['title'], ENT_QUOTES, 'UTF-8'); $res['title'] = preg_replace("/https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@]+/", "", $res['title']); while (strpos($res['title'], "\n") !== false) @@ -1921,7 +1922,7 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $ $summary = ''; if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) - $body = fix_private_photos($body,$owner['uid'],$item,$cid); + $body = fix_private_photos($body,$owner['channel_id'],$item,$cid); if($compat) { $compat_photos = compat_photos_list($body); |