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

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

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 2e15ca5f6a02d3c9eec40802f97dd6759d8ac435..28bf8c529fd1091df9f019605febef408f957a4b 100644 (file)
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -90,6 +90,12 @@ class PersonalGroupNav extends Menu
                                  _('Favorites'),
                                  sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
                                  $mine && $action =='showfavorites', 'nav_timeline_favorites');
+            $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
+                                                                  $nickname)),
+                             _('People tags'),
+                             sprintf(_('People tags by %s'), ($user_profile) ? $name : _('User')),
+                             in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
+                             'nav_timeline_peopletags');
 
             $cur = common_current_user();