Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 69347bc0d4970ff99da8c5d2df9881b459496f81..620a61ddd95bdd886d67b87bdd907e398b383a42 100644 (file)
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -64,6 +64,13 @@ 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'),