summaryrefslogtreecommitdiff
path: root/lib/action.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-02 16:46:51 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-02 16:46:51 -0500
commitab16bb876b895c16f3a7da8eb658e68dc9a9eb24 (patch)
treeaef498307290afc2ffc3fafe8dd554923335c73f /lib/action.php
parentdaa5797809ec9315db463c5ecc721f1273c0d17e (diff)
parentb6f0f72a0992596f68f5aa1d4513e6bd3884a2c0 (diff)
Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib/action.php')
-rw-r--r--lib/action.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php
index 4d4c3d4c9..587d2ab13 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -328,8 +328,14 @@ class Action extends HTMLOutputter // lawsuit
if ($user) {
$this->menuItem(common_local_url('profilesettings'),
_('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
- $this->menuItem(common_local_url('imsettings'),
+
+ if (common_config('xmpp', 'enabled')) {
+ $this->menuItem(common_local_url('imsettings'),
_('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
+ } else {
+ $this->menuItem(common_local_url('smssettings'),
+ _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
+ }
$this->menuItem(common_local_url('logout'),
_('Logout'), _('Logout from the site'), false, 'nav_logout');
} else {