summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-03 16:27:19 -0500
committerSarven Capadisli <csarven@status.net>2010-03-03 16:27:19 -0500
commit2a96d1d59deece52f7ab27c0ca6c1bfca3d4c322 (patch)
tree98fc1949cbeb08d710628c3d4d304b7c39fc3536
parent219e15ac64b0ceefcd714af27b9bbb53123dbe71 (diff)
parent43de781e43d54e1b80f15f0a5d6568e1f2ab86ac (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
-rw-r--r--actions/apitimelinegroup.php2
-rw-r--r--classes/User_group.php5
-rw-r--r--plugins/TwitterBridge/twitteradminpanel.php40
3 files changed, 9 insertions, 38 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index d0af49844..e30a08fb5 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
// @todo set all this Atom junk up inside the feed class
- $atom->setId($id);
+ #$atom->setId($id);
$atom->setTitle($title);
$atom->setSubtitle($subtitle);
$atom->setLogo($logo);
diff --git a/classes/User_group.php b/classes/User_group.php
index 1a5ddf253..0460c9870 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -455,6 +455,11 @@ class User_group extends Memcached_DataObject
$group = new User_group();
$group->query('BEGIN');
+
+ if (empty($uri)) {
+ // fill in later...
+ $uri = null;
+ }
$group->nickname = $nickname;
$group->fullname = $fullname;
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();
}