Merge pull request #3319 from Hypolite/issue/#3316

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index a1d086cb9d7c41f772b1d4e2797532d63c523866..93c42cd7b183eed4d6003feaf53ae934f99b0229 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -416,8 +416,8 @@ These Fields are not added below (yet). They are here to for bug search.
 `item`.`shadow`,
 */
 
-       return "`item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
-               `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
+       return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
+               `item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
                `item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
                `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
                `item`.`commented`, `item`.`created`, `item`.`edited`,
@@ -1066,8 +1066,9 @@ function builtin_activity_puller($item, &$conv_responses) {
                        else
                                $conv_responses[$mode][$item['thr-parent']] ++;
 
-                       if((local_user()) && (local_user() == $item['uid']) && ($item['self']))
+                       if (public_contact() == $item['author-id']) {
                                $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
+                       }
 
                        $conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;