X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMapstraction%2Fallmap.php;h=d1a9fddabb467b269cf647eed081c80ebd65fb7e;hb=02c5d68bed794b888e7d4a41f2c08d688a67ba6d;hp=62d8d044582b627ce3b7c0f0c5b80a8c215da1c7;hpb=37994e3ff124fa2456c7dcf59970ca97d8db83ff;p=quix0rs-gnu-social.git

diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index 62d8d04458..d1a9fddabb 100644
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -46,15 +46,15 @@ class AllmapAction extends MapAction
 {
     function prepare($args)
     {
-        if(parent::prepare($args)) {
+        if (parent::prepare($args)) {
             $cur = common_current_user();
-            if (!empty($cur) && $cur->id == $this->user->id) {
-                $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-            } else {
-                $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-            }
+            $stream = new InboxNoticeStream($this->user, $cur->getProfile());
+            $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                                NOTICES_PER_PAGE + 1,
+                                                null,
+                                                null);
             return true;
-        }else{
+        } else {
             return false;
         }
     }