From fc3d52c120f219a1cdc57b9d2f7646c7231155f3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 17 Sep 2011 14:37:19 -0400 Subject: [PATCH] disable routes that aren't available in single-user mode --- lib/action.php | 8 ++++++-- lib/publicgroupnav.php | 20 ++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/action.php b/lib/action.php index 38685f928a..9612a82b71 100644 --- a/lib/action.php +++ b/lib/action.php @@ -324,8 +324,12 @@ class Action extends HTMLOutputter // lawsuit $this->script('xbImportNode.js'); $this->script('geometa.js'); } - $this->inlineScript('var _peopletagAC = "' . - common_local_url('peopletagautocomplete') . '";'); + // This route isn't available in single-user mode. + // Not sure why, but it causes errors here. + if (!common_config('singleuser', 'enabled')) { + $this->inlineScript('var _peopletagAC = "' . + common_local_url('peopletagautocomplete') . '";'); + } $this->showScriptMessages(); // Anti-framing code to avoid clickjacking attacks in older browsers. // This will show a blank page if the page is being framed, which is diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php index 77243fda7a..2b9c418440 100644 --- a/lib/publicgroupnav.php +++ b/lib/publicgroupnav.php @@ -62,10 +62,12 @@ class PublicGroupNav extends Menu $this->action->elementStart('ul', array('class' => 'nav')); if (Event::handle('StartPublicGroupNav', array($this))) { - // TRANS: Menu item in search group navigation panel. - $this->out->menuItem(common_local_url('public'), _m('MENU','Public'), - // TRANS: Menu item title in search group navigation panel. - _('Public timeline'), $this->actionName == 'public', 'nav_timeline_public'); + if (!common_config('singleuser', 'enabled')) { + // TRANS: Menu item in search group navigation panel. + $this->out->menuItem(common_local_url('public'), _m('MENU','Public'), + // TRANS: Menu item title in search group navigation panel. + _('Public timeline'), $this->actionName == 'public', 'nav_timeline_public'); + } // TRANS: Menu item in search group navigation panel. $this->out->menuItem(common_local_url('groups'), _m('MENU','Groups'), @@ -84,10 +86,12 @@ class PublicGroupNav extends Menu _('Featured users'), $this->actionName == 'featured', 'nav_featured'); } - // 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'); + 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)); }