summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-28 22:29:26 -0800
committerBrion Vibber <brion@pobox.com>2010-01-28 22:29:26 -0800
commit990b0f7995962cc99c573a3d33109c337b36ec10 (patch)
tree2bcb1a1361d8b7cba78215c3c5fa03e6c6c82ac8 /lib
parentccb678ad15ee57302c751ea995264415c64ad298 (diff)
parentfa9ae594454793b20c22959750043d19224c9ff4 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib')
-rw-r--r--lib/adminpanelaction.php11
-rw-r--r--lib/default.php2
-rw-r--r--lib/router.php3
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index f62bfa458..f05627b31 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -327,9 +327,14 @@ class AdminPanelNav extends Widget
_('Access configuration'), $action_name == 'accessadminpanel', 'nav_design_admin_panel');
}
- if ($this->canAdmin('paths')) {
- $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
- _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
+ if ($this->canAdmin('paths')) {
+ $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
+ _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
+ }
+
+ if ($this->canAdmin('sessions')) {
+ $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
+ _('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_design_admin_panel');
}
Event::handle('EndAdminPanelNav', array($this));
diff --git a/lib/default.php b/lib/default.php
index c01508695..1337a9633 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -266,7 +266,7 @@ $default =
'OpenID' => null),
),
'admin' =>
- array('panels' => array('design', 'site', 'user', 'paths', 'access')),
+ array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions')),
'singleuser' =>
array('enabled' => false,
'nickname' => null),
diff --git a/lib/router.php b/lib/router.php
index 03765b39d..be9cfac0c 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -637,8 +637,9 @@ class Router
$m->connect('admin/site', array('action' => 'siteadminpanel'));
$m->connect('admin/design', array('action' => 'designadminpanel'));
$m->connect('admin/user', array('action' => 'useradminpanel'));
- $m->connect('admin/access', array('action' => 'accessadminpanel'));
+ $m->connect('admin/access', array('action' => 'accessadminpanel'));
$m->connect('admin/paths', array('action' => 'pathsadminpanel'));
+ $m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
$m->connect('getfile/:filename',
array('action' => 'getfile'),