X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fpublicgroupnav.php;h=620a61ddd95bdd886d67b87bdd907e398b383a42;hb=b24d711f552854d88f2df2120672bdaf173335fc;hp=79190a11f05edb4c379e3419b1dc3dbffeb7b43d;hpb=d594c83a5a9a9d42fce917b544c28591fcadb1aa;p=quix0rs-gnu-social.git

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 79190a11f0..620a61ddd9 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/widget.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Menu for public group of actions
@@ -68,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'),
@@ -88,13 +91,6 @@ class PublicGroupNav extends Menu
                     _('Featured users'), $this->actionName == 'featured', 'nav_featured');
             }
 
-            if (!common_config('singleuser', 'enabled')) {
-                // TRANS: Menu item in search group navigation panel.
-                $this->out->menuItem(common_local_url('favorited'), _m('MENU','Popular'),
-                                     // TRANS: Menu item title in search group navigation panel.
-                                     _('Popular notices'), $this->actionName == 'favorited', 'nav_timeline_favorited');
-            }
-
             Event::handle('EndPublicGroupNav', array($this));
         }
         $this->action->elementEnd('ul');