Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

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

diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 52110836c36762950f44115ed0638dc9e62d477c..abadaee6228fc8dbdbec17506fa8ce8b5dffd4ff 100644 (file)
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -128,6 +128,15 @@ class SubGroupNav extends Menu
                                          $this->user->nickname),
                                  $action == 'usergroups',
                                  'nav_usergroups');
+            $this->out->menuItem(common_local_url('peopletagsbyuser',
+                                                  array('nickname' =>
+                                                        $this->user->nickname)),
+                                 _('People tags'),
+                                 sprintf(_('People tags by %s'),
+                                         $this->user->nickname),
+                                 in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
+                                 'nav_timeline_peopletags');
+
             if (common_config('invite', 'enabled') && !is_null($cur) && $this->user->id === $cur->id) {
                 $this->out->menuItem(common_local_url('invite'),
                                      // TRANS: Menu item in local navigation menu.