summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-02-02 20:20:21 +0000
committerRobin Millette <millette@plantard.controlezvous.ca>2009-02-02 20:20:21 +0000
commitf9edd1101b95ea41051fee2e8e983bebd890cc50 (patch)
tree744ded87d81f9a7e5acbb573d2f7fd3ae58a3681
parent655869989f2f1f8d826c5bc4e8762ca97a33fd62 (diff)
trac #1099: main menu should not lead to IM settings when IM is disabled
-rw-r--r--lib/action.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php
index 8f02b36bf..dcd24fb60 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -326,8 +326,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 {