don't show full profile menu all the time

diff --git a/lib/defaultlocalnav.php b/lib/defaultlocalnav.php
index b42d3a804c31a1f22c7d146c808452eb4300fde2..7af3c9673f68508473b1dc34766974d4acfaaa2f 100644 (file)
--- a/lib/defaultlocalnav.php
+++ b/lib/defaultlocalnav.php
@@ -56,9 +56,6 @@ class DefaultLocalNav extends Menu
         if (!empty($user)) {
             $pn = new PersonalGroupNav($this->action);
             $this->submenu(_m('Home'), $pn);
-
-            $sn = new SubGroupNav($this->action, $user);
-            $this->submenu(_m('Profile'), $sn);
         }
 
         $bn = new PublicGroupNav($this->action);

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 6a31358596e540b4e62a16f855815af62fd62465..e428e92e632cbc92064392a3d1bbae0b720f1362 100644 (file)
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -71,6 +71,12 @@ class PersonalGroupNav extends Menu
                                  _('Home'),
                                  sprintf(_('%s and friends'), $name),
                                  $action == 'all', 'nav_timeline_personal');
+            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
+                                                                      $this->user->nickname)),
+                                 _('Profile'),
+                                 (empty($profile)) ? $this->user->nickname : $profile->getBestName(),
+                                 $action == 'showstream',
+                                 'nav_profile');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                    $nickname)),
                                  _('Replies'),