summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/OStatus/OStatusPlugin.php5
-rw-r--r--plugins/TwitterBridge/twitteradminpanel.php40
2 files changed, 4 insertions, 41 deletions
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index b4b446a7f..ca6786a26 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -216,17 +216,14 @@ class OStatusPlugin extends Plugin
if (empty($cur)) {
// Add an OStatus subscribe
- $output->elementStart('li', 'entity_subscribe');
$url = common_local_url('ostatusinit',
array('nickname' => $group->nickname));
$output->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'),
_m('Join'));
-
- $output->elementEnd('li');
}
- return false;
+ return true;
}
/**
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();
}