Some more places to add the user id

diff --git a/include/conversation.php b/include/conversation.php
index fb485baf12d4f8adca4aa85ad2565ac7c45853d3..290d68bf3da80c1910528eb35839cb878b7f50c6 100644 (file)
--- 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 876339dea11d8de39de3408ef5826a8429b7f783..59be7487bdca55a8318410b80e4eeab16f2dc199 100644 (file)
--- 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 80e913d204beacb73be0e56a929755bf04650172..6286569a54f0a57346a1ace84ba6dd278ea49042 100644 (file)
--- 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 2af2845f27d3b71d04846696c2bd4b5f12915b04..2fb947a8365df885435447d14822f2c69e2dde79 100644 (file)
--- 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 4c461e418300d30b4324276df31ba517385b6d6a..a600965e46293e57d69e838b38496227196dc4f4 100644 (file)
--- 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));