GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sarven Capadisli 2010-03-03 16:27:19 -05:00
commit 2a96d1d59d
3 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apitimelinegroup.php
View File

@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
// @todo set all this Atom junk up inside the feed class // @todo set all this Atom junk up inside the feed class
$atom->setId($id); #$atom->setId($id);
$atom->setTitle($title); $atom->setTitle($title);
$atom->setSubtitle($subtitle); $atom->setSubtitle($subtitle);
$atom->setLogo($logo); $atom->setLogo($logo);

5
classes/User_group.php
View File

@ -455,6 +455,11 @@ class User_group extends Memcached_DataObject
$group = new User_group(); $group = new User_group();
$group->query('BEGIN'); $group->query('BEGIN');
if (empty($uri)) {
// fill in later...
$uri = null;
}
$group->nickname = $nickname; $group->nickname = $nickname;
$group->fullname = $fullname; $group->fullname = $fullname;

40
plugins/TwitterBridge/twitteradminpanel.php
View File

@ -225,46 +225,12 @@ class TwitterAdminPanelForm extends AdminForm
); );
$this->unli(); $this->unli();
$globalConsumerKey = common_config('twitter', 'global_consumer_key'); $globalConsumerKey = common_config('twitter', 'global_consumer_key');
$globalConsumerSec = common_config('twitter', 'global_consumer_secret'); $globalConsumerSec = common_config('twitter', 'global_consumer_secret');
if (!empty($globalConsumerKey)) { if (!empty($globalConsumerKey) && !empty($globalConsumerSec)) {
$this->li(); $this->li();
$this->out->element( $this->out->element('p', 'form_guide', _('Note: a global consumer key and secret are set.'));
'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->unli(); $this->unli();
} }