Merge branch 'twitter-oauth' into 0.8.x

[quix0rs-gnu-social.git] / actions / twittersettings.php

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 7fffa0af018b8b5909d26fa51651f6701afc3382..0859ab9d34ef55c8b45bc9ad71f0e257f6aeb154 100644 (file)
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -82,6 +82,12 @@ class TwittersettingsAction extends ConnectSettingsAction
 
     function showContent()
     {
+        if (!common_config('twitter', 'enabled')) {
+            $this->element('div', array('class' => 'error'),
+                           _('Twitter is not available.'));
+            return;
+        }
+
         $user = common_current_user();
 
         $profile = $user->getProfile();