Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

1 files changed, 3 insertions, 37 deletions

diff --git a/plugins/TwitterBridge/twitteradminpanel.php b/plugins/TwitterBridge/twitteradminpanel.php
index 0ed53bc05..a78a92c66 100644
--- a/plugins/TwitterBridge/twitteradminpanel.php
+++ b/plugins/TwitterBridge/twitteradminpanel.php
@@ -225,46 +225,12 @@ class TwitterAdminPanelForm extends AdminForm
         );
         $this->unli();
 
-                $globalConsumerKey = common_config('twitter', 'global_consumer_key');
+        $globalConsumerKey = common_config('twitter', 'global_consumer_key');
         $globalConsumerSec = common_config('twitter', 'global_consumer_secret');
 
-        if (!empty($globalConsumerKey)) {
+        if (!empty($globalConsumerKey) && !empty($globalConsumerSec)) {
             $this->li();
-            $this->out->element(
-                'label',
-                array('for' => 'global_consumer_key'),
-                ''
-            );
-            $this->out->element(
-                'input',
-                array(
-                    'name'     => 'global_consumer_key',
-                    'type'     => 'text',
-                    'id'       => 'global_consumer_key',
-                    'value'    => $globalConsumerKey,
-                    'disabled' => 'true'
-                )
-            );
-            $this->out->element('p', 'form_guide', _('Global consumer key'));
-            $this->unli();
-
-            $this->li();
-            $this->out->element(
-                'label',
-                array('for' => 'global_consumer_secret'),
-                ''
-            );
-            $this->out->element(
-                'input',
-                array(
-                    'name'     => 'global_consumer_secret',
-                    'type'     => 'text',
-                    'id'       => 'global_consumer_secret',
-                    'value'    => $globalConsumerSec,
-                    'disabled' => 'true'
-                   )
-            );
-            $this->out->element('p', 'form_guide', _('Global consumer secret'));
+            $this->out->element('p', 'form_guide', _('Note: a global consumer key and secret are set.'));
             $this->unli();
         }