don't show addressee info for root notice of conversation

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 3725ff0535c214a015aff6647c494431cd2cbbf9..96be0df0c58d037eb2eb988665c077b84a0739f4 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -221,7 +221,7 @@ class ThreadedNoticeListItem extends NoticeListItem
                     }
                     foreach (array_reverse($notices) as $notice) {
                         if (Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice))) {
-                            $item = new ThreadedNoticeListSubItem($notice, $this->out);
+                            $item = new ThreadedNoticeListSubItem($notice, $this->notice, $this->out);
                             $item->show();
                             Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice));
                         }
@@ -248,6 +248,14 @@ class ThreadedNoticeListItem extends NoticeListItem
 // @todo FIXME: needs documentation.
 class ThreadedNoticeListSubItem extends NoticeListItem
 {
+    protected $root = null;
+
+    function __construct($notice, $root, $out)
+    {
+        $this->root = $root;
+        parent::__construct($notice, $out);
+    }
+
     function avatarSize()
     {
         return AVATAR_STREAM_SIZE; // @fixme would like something in between
@@ -268,6 +276,23 @@ class ThreadedNoticeListSubItem extends NoticeListItem
         //
     }
 
+    function getReplyProfiles()
+    {
+        $all = parent::getReplyProfiles();
+
+        $profiles = array();
+
+        $rootAuthor = $this->root->getProfile();
+
+        foreach ($all as $profile) {
+            if ($profile->id != $rootAuthor->id) {
+                $profiles[] = $profile;
+            }
+        }
+
+        return $profiles;
+    }
+
     function showEnd()
     {
         $item = new ThreadedNoticeListInlineFavesItem($this->notice, $this->out);