Merge branch '1.0.x' into emailregistration

[quix0rs-gnu-social.git] / actions / conversationreplies.php

diff --git a/actions/conversationreplies.php b/actions/conversationreplies.php
index 51bc97f1fceaafb6594b28ade68bed45ab93cdab..55c3efa9e0cb6eb63099b23885d608a816733531 100644 (file)
--- a/actions/conversationreplies.php
+++ b/actions/conversationreplies.php
@@ -66,7 +66,7 @@ class ConversationRepliesAction extends ConversationAction
      */
     function showContent()
     {
-        $ct = new FullThreadedNoticeList($this->notices, $this);
+        $ct = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
 
         $cnt = $ct->show();
     }
@@ -86,19 +86,3 @@ class ConversationRepliesAction extends ConversationAction
         $this->elementEnd('html');
     }
 }
-
-class FullThreadedNoticeList extends ThreadedNoticeList
-{
-    function newListItem($notice)
-    {
-        return new FullThreadedNoticeListItem($notice, $this->out);
-    }
-}
-
-class FullThreadedNoticeListItem extends ThreadedNoticeListItem
-{
-    function initialItems()
-    {
-        return 1000; // @fixme
-    }
-}