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:
Brion Vibber
2010-03-03 09:33:38 -08:00
parent 1e63fda669 11750e832f
commit 9801c60bea
5 changed files with 84 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/OStatus/OStatusPlugin.php
View File

@@ -210,6 +210,26 @@ class OStatusPlugin extends Plugin
return false;
}
function onStartGroupSubscribe($output, $group)
{
$cur = common_current_user();
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;
}
/**
* Check if we've got remote replies to send via Salmon.
*
@@ -711,7 +731,7 @@ class OStatusPlugin extends Plugin
return true;
}
function onStartShowAllContent($action)
function onEndShowSubscriptionsMiniList($action)
{
$this->showEntityRemoteSubscribe($action);
@@ -727,7 +747,7 @@ class OStatusPlugin extends Plugin
'class' => 'entity_subscribe'));
$action->element('a', array('href' => common_local_url('ostatussub'),
'class' => 'entity_remote_subscribe')
, _m('Subscribe to remote user'));
, _m('New'));
$action->elementEnd('p');
$action->elementEnd('div');
}