better output for registration confirmation

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

diff --git a/actions/public.php b/actions/public.php
index d906d65501a996dada406b92040e692666eafb51..6ab9d1de9c0687bcf51a4cde115c991fe75ac8c7 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -88,7 +88,7 @@ class PublicAction extends Action
 
         $this->userProfile = Profile::current();
 
-        $stream = new PublicNoticeStream($this->userProfile);
+        $stream = new ThreadingPublicNoticeStream($this->userProfile);
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
@@ -222,10 +222,10 @@ class PublicAction extends Action
 
     function showSections()
     {
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
         $ibs = new InviteButtonSection($this);
         $ibs->show();
+        $pop = new PopularNoticeSection($this);
+        $pop->show();
         $gbp = new GroupsByMembersSection($this);
         $gbp->show();
         $feat = new FeaturedUsersSection($this);
@@ -252,3 +252,11 @@ class PublicAction extends Action
         $this->elementEnd('div');
     }
 }
+
+class ThreadingPublicNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($profile)
+    {
+        parent::__construct(new PublicNoticeStream($profile));
+    }
+}