diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 3 | ||||
| -rw-r--r-- | include/notifier.php | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index d37f7708f..7f62f6dec 100644 --- a/include/items.php +++ b/include/items.php @@ -187,6 +187,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { else { $verb = construct_verb($item); $actobj = construct_activity($item); + $mentioned = get_mentions($item); if($item['parent'] == $item['id']) { $atom .= replace_macros($item_template, array( @@ -207,6 +208,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 + '$mentioned' => $mentioned, '$comment_allow' => $allow )); } @@ -224,6 +226,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner_nick . '/' . $item['id']), '$verb' => xmlify($verb), '$actobj' => $actobj, // do not xmlify + '$mentioned' => $mentioned, '$parent_id' => xmlify($item['parent-uri']), '$comment_allow' => $allow )); diff --git a/include/notifier.php b/include/notifier.php index 884493a79..1f6bfa36a 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -213,6 +213,7 @@ $verb = construct_verb($item); $actobj = construct_activity($item); + $mentioned = get_mentions($item); if($item['id'] == $item_id) { $slap = replace_macros($cmnt_template, array( @@ -231,6 +232,7 @@ '$type' => 'html', '$verb' => xmlify($verb), '$actobj' => $actobj, + '$mentioned' => $mentioned, '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), '$content' => xmlify(bbcode($item['body'])), '$parent_id' => xmlify($item['parent-uri']), @@ -253,6 +255,7 @@ '$type' => 'text', '$verb' => xmlify($verb), '$actobj' => $actobj, + '$mentioned' => $mentioned, '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), '$content' => xmlify($item['body']), '$parent_id' => xmlify($item['parent-uri']), @@ -283,6 +286,7 @@ $verb = construct_verb($item); $actobj = construct_activity($item); + $mentioned = get_mentions($item); if($item['parent'] == $item['id']) { $atom .= replace_macros($item_template, array( @@ -301,6 +305,7 @@ '$type' => 'text', '$verb' => xmlify($verb), '$actobj' => $actobj, + '$mentioned' => $mentioned, '$content' => xmlify($item['body']), '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), '$comment_allow' => (($item['last-child']) ? 1 : 0) @@ -321,6 +326,7 @@ '$type' => 'html', '$verb' => xmlify($verb), '$actobj' => $actobj, + '$mentioned' => $mentioned, '$content' => xmlify(bbcode($item['body'])), '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), '$comment_allow' => (($item['last-child']) ? 1 : 0) @@ -343,6 +349,7 @@ '$type' => 'text', '$verb' => xmlify($verb), '$actobj' => $actobj, + '$mentioned' => $mentioned, '$parent_id' => xmlify($item['parent-uri']), '$comment_allow' => (($item['last-child']) ? 1 : 0) )); @@ -361,6 +368,7 @@ '$type' => 'html', '$verb' => xmlify($verb), '$actobj' => $actobj, + '$mentioned' => $mentioned, '$parent_id' => xmlify($item['parent-uri']), '$comment_allow' => (($item['last-child']) ? 1 : 0) )); |