conversation code changes

2 files changed, 21 insertions, 22 deletions

diff --git a/actions/conversation.php b/actions/conversation.php
index 654a670f5..79197da2d 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -107,17 +107,11 @@ class ConversationAction extends Action
 
     function showContent()
     {
-        $offset = ($this->page-1) * NOTICES_PER_PAGE;
-        $limit  = NOTICES_PER_PAGE + 1;
-
-        $notices = Notice::conversationStream($this->id, $offset, $limit);
+        $notices = Notice::conversationStream($this->id);
 
         $ct = new ConversationTree($notices, $this);
 
         $cnt = $ct->show();
-
-        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
-                          $this->page, 'conversation', array('id' => $this->id));
     }
 }
 
@@ -148,6 +142,25 @@ class ConversationTree extends NoticeList
     {
         $cnt = 0;
 
+        $this->_buildTree();
+
+        $this->out->elementStart('div', array('id' =>'notices_primary'));
+        $this->out->element('h2', null, _('Notices'));
+        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
+
+        if (array_key_exists('root', $this->tree)) {
+            $rootid = $this->tree['root'][0];
+            $this->showNoticePlus($rootid);
+        }
+
+        $this->out->elementEnd('ol');
+        $this->out->elementEnd('div');
+
+        return $cnt;
+    }
+
+    function _buildTree()
+    {
         $this->tree  = array();
         $this->table = array();
 
@@ -168,20 +181,6 @@ class ConversationTree extends NoticeList
                 $this->tree[$notice->reply_to] = array($notice->id);
             }
         }
-
-        $this->out->elementStart('div', array('id' =>'notices_primary'));
-        $this->out->element('h2', null, _('Notices'));
-        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
-
-        if (array_key_exists('root', $this->tree)) {
-            $rootid = $this->tree['root'][0];
-            $this->showNoticePlus($rootid);
-        }
-
-        $this->out->elementEnd('ol');
-        $this->out->elementEnd('div');
-
-        return $cnt;
     }
 
     /**
diff --git a/classes/Notice.php b/classes/Notice.php
index 502cc57b8..2ba2f31b1 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -795,7 +795,7 @@ class Notice extends Memcached_DataObject
         $notice->selectAdd(); // clears it
         $notice->selectAdd('id');
 
-        $notice->whereAdd('conversation = '.$id);
+        $notice->conversation = $id;
 
         $notice->orderBy('id DESC');