summaryrefslogtreecommitdiff
path: root/actions/imsettings.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-08-06 22:38:06 -0400
committerCraig Andrews <candrews@integralblue.com>2009-08-06 22:38:06 -0400
commit1c3a1360a9bde9bd916df8a2e064438d3ef600e7 (patch)
tree775668662785556b7d79209b9cc453368d04c053 /actions/imsettings.php
parent49eb6009a54e9fd5609cce1ba7cfc9d85edff8c0 (diff)
parent7c9e12a0b8117809d559e1120b5f4f0cf578e646 (diff)
Merge commit 'jeff-themovie/0.8.x-subsystems-enabled' into 0.8.x
Diffstat (limited to 'actions/imsettings.php')
-rw-r--r--actions/imsettings.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php
index e0f5ede3a..70a6f37d4 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -84,6 +84,12 @@ class ImsettingsAction extends ConnectSettingsAction
function showContent()
{
+ if (!common_config('xmpp', 'enabled')) {
+ $this->element('div', array('class' => 'error'),
+ _('IM is not available.'));
+ return;
+ }
+
$user = common_current_user();
$this->elementStart('form', array('method' => 'post',
'id' => 'form_settings_im',