From: Michael <heluecht@pirati.ca>
Date: Sat, 26 May 2018 20:03:30 +0000 (+0000)
Subject: Some more places to add the user id
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c36109f02c8135b2b88d7e0231ab5a61d61e3d6;p=friendica.git

Some more places to add the user id
---

diff --git a/include/conversation.php b/include/conversation.php
index fb485baf12..290d68bf3d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -587,7 +587,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 				. " var profile_page = 1; </script>";
 		}
 	} elseif ($mode === 'community') {
-		$items = conversation_add_children($items, true, $order);
+		$items = conversation_add_children($items, true, $order, $uid);
 		$profile_owner = 0;
 		if (!$update) {
 			$live_update_div = '<div id="live-community"></div>' . "\r\n"
@@ -890,7 +890,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
  *
  * @return array items with parents and comments
  */
-function conversation_add_children($parents, $block_authors, $order, $uid = 0) {
+function conversation_add_children($parents, $block_authors, $order, $uid) {
 	$max_comments = Config::get('system', 'max_comments', 100);
 
 	if ($max_comments > 0) {
diff --git a/mod/community.php b/mod/community.php
index 876339dea1..59be7487bd 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -171,7 +171,7 @@ function community_content(App $a, $update = 0)
 		$s = $r;
 	}
 
-	$o .= conversation($a, $s, 'community', $update);
+	$o .= conversation($a, $s, 'community', $update, false, 'commented', local_user());
 
 	if (!$update) {
 		$o .= alt_pager($a, count($r));
diff --git a/mod/display.php b/mod/display.php
index 80e913d204..6286569a54 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -369,7 +369,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	if (!$update) {
 		$o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
 	}
-	$o .= conversation($a, $items, 'display', $update_uid);
+	$o .= conversation($a, $items, 'display', $update_uid, false, 'commented', local_user());
 
 	// Preparing the meta header
 	$description = trim(HTML::toPlaintext(BBCode::convert($s[0]["body"], false), 0, true));
diff --git a/mod/profile.php b/mod/profile.php
index 2af2845f27..2fb947a836 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -365,7 +365,7 @@ function profile_content(App $a, $update = 0)
 		}
 	}
 
-	$o .= conversation($a, $items, 'profile', $update);
+	$o .= conversation($a, $items, 'profile', $update, false, 'commented', local_user());
 
 	if (!$update) {
 		$o .= alt_pager($a, count($items));
diff --git a/mod/search.php b/mod/search.php
index 4c461e4183..a600965e46 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -241,7 +241,7 @@ function search_content(App $a) {
 	]);
 
 	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
-	$o .= conversation($a,$r,'search',false);
+	$o .= conversation($a, $r, 'search', false, false, 'commented', local_user());
 
 	$o .= alt_pager($a,count($r));