Merge commit 'refs/merge-requests/27' of https://gitorious.org/social/mainline into...

diff --git a/classes/Notice.php b/classes/Notice.php
index 62f6d1a685a9bf9fca590c01c66ee88d3c3a4fa2..20374e0e2e06233ed03c9298aedb58d51f0ff27f 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1271,10 +1271,16 @@ class Notice extends Managed_DataObject
         }
 
         // If this isn't a reply to anything, then it's its own
-        // root.
+        // root if it's the earliest notice in the conversation:
 
         if (empty($this->reply_to)) {
-            return $this;
+            $root = new Notice;
+            $root->conversation = $this->conversation;
+            $root->orderBy('notice.created ASC');
+            $root->find();
+            $root->fetch();
+            $root->free();
+            return $root;
         }
         
         if (is_null($profile)) {