Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / threadednoticelist.php

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index acb9efb972efd702b9ba5a3c3a82b3809cd39ec3..4b5d28de3f58596562caa0cdb60fcecef38193fe 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -195,7 +195,7 @@ class ThreadedNoticeListItem extends NoticeListItem
     function showEnd()
     {
         $max = $this->initialItems();
-        if (!$this->repeat) {
+        if (!$this->repeat instanceof Notice) {
             $stream = new ConversationNoticeStream($this->notice->conversation, $this->userProfile);
             $notice = $stream->getNotices(0, $max + 2);
             $notices = array();
@@ -282,9 +282,9 @@ class ThreadedNoticeListSubItem extends NoticeListItem
         //
     }
 
-    function getReplyProfiles()
+    function getAttentionProfiles()
     {
-        $all = parent::getReplyProfiles();
+        $all = parent::getAttentionProfiles();
 
         $profiles = array();