Using GNUSOCIAL_VERSION instead of STATUSNET_VERSION

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

diff --git a/actions/conversationreplies.php b/actions/conversationreplies.php
index 21780fdf1da4a16d9545ce6d9f9250564dc3e2e6..49c806fa98588a00ccf3569a528830806e1c11f8 100644 (file)
--- a/actions/conversationreplies.php
+++ b/actions/conversationreplies.php
@@ -66,18 +66,14 @@ class ConversationRepliesAction extends ConversationAction
      */
     function showContent()
     {
-        $notices = Notice::conversationStream($this->id, null, null);
-
-        $ct = new FullThreadedNoticeList($notices, $this);
+        $ct = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
 
         $cnt = $ct->show();
     }
 
     function showAjax()
     {
-        header('Content-Type: text/xml;charset=utf-8');
-        $this->xw->startDocument('1.0', 'UTF-8');
-        $this->elementStart('html');
+        $this->startHTML('text/xml;charset=utf-8');
         $this->elementStart('head');
         // TRANS: Title for conversation page.
         $this->element('title', null, _m('TITLE','Notice'));
@@ -85,22 +81,6 @@ class ConversationRepliesAction extends ConversationAction
         $this->elementStart('body');
         $this->showContent();
         $this->elementEnd('body');
-        $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
+        $this->endHTML();
     }
 }