X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=1059941b9e0bcb274b12f678ff37d4f7b6895601;hb=3f03f3b4b7e5bdaefe80d50ec9185e1bf668b927;hp=1c97a1abe4e074ff1b5b8875c3ba01245cb75e63;hpb=924869ab5b75fd496014a1b7ca1240a6df939fc6;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 1c97a1abe4..1059941b9e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -389,7 +389,7 @@ function visible_activity($item) {
 	 * likes (etc.) can apply to other things besides posts. Check if they are post children,
 	 * in which case we handle them specially
 	 */
-	$hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+	$hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW];
 	foreach ($hidden_activities as $act) {
 		if (activity_match($item['verb'], $act)) {
 			return false;
@@ -497,7 +497,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 			}
 		}
 	} elseif ($mode === 'notes') {
-		$items = conversation_add_children($items, false, $order, $uid);
+		$items = conversation_add_children($items, false, $order, local_user());
 		$profile_owner = local_user();
 
 		if (!$update) {
@@ -798,7 +798,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
 	foreach ($parents AS $parent) {
 		$condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
-			$parent['uri'], local_user()];
+			$parent['uri'], $uid];
 		if ($block_authors) {
 			$condition[0] .= "AND NOT `author`.`hidden`";
 		}
@@ -994,6 +994,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 function format_like($cnt, array $arr, $type, $id) {
 	$o = '';
 	$expanded = '';
+	$phrase = '';
 
 	if ($cnt == 1) {
 		$likers = $arr[0];