Avoid having to check for notices without rendered copies in upgrade.php

[quix0rs-gnu-social.git] / lib / peopletaggroupnav.php

diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index c247bdb8d843bcdafecf970e6280858f0123f329..fb579affe09c77f73774aca20243fbd040713279 100644 (file)
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -61,7 +61,7 @@ class PeopletagGroupNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-    function __construct($action=null)
+    function __construct(Action $action=null)
     {
         parent::__construct($action);
         $this->action = $action;
@@ -76,14 +76,20 @@ class PeopletagGroupNav extends Widget
     {
         $user = null;
 
-       // FIXME: we should probably pass this in
+       // FIXME: we should probably pass this in and check when PeopletagGroupNav is actually loaded etc.
 
         $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('tagger');
+
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+        } else {
+            $nickname = $this->action->arg('tagger');
+        }
+
         $tag = $this->action->trimmed('tag');
 
         if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
+            $user = User::getKV('nickname', $nickname);
             $user_profile = $user->getProfile();
 
             if ($tag) {
@@ -101,7 +107,7 @@ class PeopletagGroupNav extends Widget
 
         if (Event::handle('StartPeopletagGroupNav', array($this))) {
             // People tag timeline
-            $this->out->menuItem(common_local_url('showprofiletag', array('tagger' => $user_profile->nickname,
+            $this->out->menuItem(common_local_url('showprofiletag', array('nickname' => $user_profile->nickname,
                                                                           'tag'    => $tag->tag)),
                              // TRANS: Menu item in list navigation panel.
                              _m('MENU','List'),
@@ -138,7 +144,7 @@ class PeopletagGroupNav extends Widget
                 // Edit
                 $this->out->menuItem(common_local_url('editpeopletag', array('tagger' => $user->nickname,
                                                                              'tag'    => $tag->tag)),
-                                 // TRANS: Menu item in people tag navigation panel.
+                                 // TRANS: Menu item in list navigation panel.
                                  _m('MENU','Edit'),
                                  // TRANS: Menu item title in list navigation panel.
                                  // TRANS: %s is a list.