diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
| commit | ff87732053bae38879988ba7d002a294998ccb4e (patch) | |
| tree | ccccfe7fc8976baf1f0cd4438a57bf817dc4052c /actions/imsettings.php | |
| parent | 27aeba01dd366f15f7847267b7518fb873987ddb (diff) | |
| parent | f3cdc7f272e409d391979d3e6c58dd63573530c0 (diff) | |
Merge branch '0.8.x' into testing
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
Diffstat (limited to 'actions/imsettings.php')
| -rw-r--r-- | actions/imsettings.php | 6 |
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', |