diff options
| author | zotlabs <mike@macgirvin.com> | 2020-01-24 19:38:21 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-01-24 19:38:21 -0800 |
| commit | 19a8dfaa5c55b674df25ae7af5c1ffcf9070e522 (patch) | |
| tree | 72461b15f54d222d12a1657c5ec534c25f93a236 /include/feedutils.php | |
| parent | 293d411efb28b8f20a0208e3c52883e9fbb8cea7 (diff) | |
| parent | fa45ea1d84f27c6b4ddfdcffeed622cca354f3d9 (diff) | |
| download | volse-hubzilla-19a8dfaa5c55b674df25ae7af5c1ffcf9070e522.tar.gz volse-hubzilla-19a8dfaa5c55b674df25ae7af5c1ffcf9070e522.tar.bz2 volse-hubzilla-19a8dfaa5c55b674df25ae7af5c1ffcf9070e522.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/feedutils.php')
| -rw-r--r-- | include/feedutils.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index 6d14eb5c4..9ff09cc66 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']); } } @@ -1921,7 +1921,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); |