Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

* '0.8.x' of git@gitorious.org:laconica/dev:
  Display more oembed info in attachment popup.
  order notices in a conversation

1 files changed, 2 insertions, 0 deletions

diff --git a/actions/conversation.php b/actions/conversation.php
index 20c68986c..d3fc5b6a9 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -217,6 +217,8 @@ class ConversationTree extends NoticeList
 
             $this->out->elementStart('ol', array('class' => 'notices'));
 
+            sort($children);
+
             foreach ($children as $child) {
                 $this->showNoticePlus($child);
             }