Merge branch 'emailsitesetup' into 1.0.x

[quix0rs-gnu-social.git] / plugins / Mapstraction / allmap.php

diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index fa05ccc7ae30db7e6567b93244d57e5bcf21f633..d1a9fddabb467b269cf647eed081c80ebd65fb7e 100644 (file)
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -46,27 +46,22 @@ 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;
         }
     }
 
     function title()
     {
-        if (!empty($this->profile->fullname)) {
-            // @todo FIXME: Bad i18n. Should be "%1$s (%2$s)".
-            $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
-        } else {
-            $base = $this->user->nickname;
-        }
+        $base = $this->profile->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: Page title.
@@ -77,7 +72,7 @@ class AllmapAction extends MapAction
             // @todo CHECKME: does this even happen? May not be needed.
             // TRANS: Page title.
             // TRANS: %1$s is a user nickname, %2$d is a page number.
-            return sprintf(_m("%1$s friends map, page %2$d"),
+            return sprintf(_m('%1$s friends map, page %2$d'),
                            $base,
                            $this->page);
         }