Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 69347bc0d4970ff99da8c5d2df9881b459496f81..ef342839d8f6fedf5514db7d19d4959f5fdebbde 100644 (file)
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -64,19 +64,19 @@ class PublicGroupNav extends Menu
                                      // TRANS: Menu item title in search group navigation panel.
                                      _('Public timeline'), $this->actionName == 'public', 'nav_timeline_public');
             }
+            if (!common_config('public', 'localonly') || $this->action->getScoped() instanceof Profile) {
+                // Allow network wide view if you're logged in
+                // TRANS: Menu item in search group navigation panel.
+                $this->out->menuItem(common_local_url('networkpublic'), _m('MENU','Network'),
+                                     // TRANS: Menu item title in search group navigation panel.
+                                     _('Network public timeline'), $this->actionName == 'networkpublic', 'nav_timeline_networkpublic');
+            }
 
             // TRANS: Menu item in search group navigation panel.
             $this->out->menuItem(common_local_url('groups'), _m('MENU','Groups'),
                 // TRANS: Menu item title in search group navigation panel.
                 _('User groups'), $this->actionName == 'groups', 'nav_groups');
 
-            if (!common_config('performance', 'high')) {
-                // TRANS: Menu item in search group navigation panel.
-                $this->out->menuItem(common_local_url('publictagcloud'), _m('MENU','Recent tags'),
-                                     // TRANS: Menu item title in search group navigation panel.
-                                     _('Recent tags'), $this->actionName == 'publictagcloud', 'nav_recent-tags');
-            }
-
             if (count(common_config('nickname', 'featured')) > 0) {
                 // TRANS: Menu item in search group navigation panel.
                 $this->out->menuItem(common_local_url('featured'), _m('MENU','Featured'),