diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 6 | ||||
| -rw-r--r-- | include/notifier.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index 2c4b77014..221a8a65c 100644 --- a/include/items.php +++ b/include/items.php @@ -153,10 +153,12 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { // public feeds get html, our own nodes use bbcode if($dfrn_id === '*') { + $allow = (($item['last-child']) ? 1 : 0); $item['body'] = bbcode($item['body']); $type = 'html'; } else { + $allow = ((($item['last-child']) && ($contact['rel']) && ($contact['rel'] != REL_FAN)) ? 1 : 0); $type = 'text'; } @@ -188,7 +190,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { '$content' => xmlify($item['body']), '$verb' => xmlify($verb), '$actobj' => $actobj, // do not xmlify - '$comment_allow' => ((($item['last-child']) && ($contact['rel']) && ($contact['rel'] != REL_FAN)) ? 1 : 0) + '$comment_allow' => $allow )); } else { @@ -206,7 +208,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { '$verb' => xmlify($verb), '$actobj' => $actobj, // do not xmlify '$parent_id' => xmlify($item['parent-uri']), - '$comment_allow' => (($item['last-child']) ? 1 : 0) + '$comment_allow' => $allow )); } } diff --git a/include/notifier.php b/include/notifier.php index ee2b22ca3..0166d0b37 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -302,7 +302,7 @@ } } - if((strlen($hub)) && ($cmd !== 'mail') && (followup == false)) { + if((strlen($hub)) && ($cmd !== 'mail') && ($followup == false)) { $params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] ); post_url($hub,$params); } |