move Invite button to top

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

diff --git a/actions/all.php b/actions/all.php
index a77d6014f4d116bc9aab8aae3ef3b6e1b219508a..96f688f72083dbf9a94b9ee95f27647458a42fe7 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -56,7 +56,7 @@ class AllAction extends ProfileAction
     {
         parent::prepare($args);
 
-        $stream = new InboxNoticeStream($this->user);
+        $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1,
@@ -185,9 +185,9 @@ class AllAction extends ProfileAction
 
     function showSections()
     {
-        $this->showSubscriptions();
         $ibs = new InviteButtonSection($this);
         $ibs->show();
+        $this->showSubscriptions();
         $this->showSubscribers();
         $this->showGroups();
         $this->showLists();
@@ -205,3 +205,11 @@ class AllAction extends ProfileAction
         }
     }
 }
+
+class ThreadingInboxNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($user, $profile)
+    {
+        parent::__construct(new InboxNoticeStream($user, $profile));
+    }
+}