forked from GNUsocial/gnu-social
Merge branch 'master' of gitorious.org:statusnet/mainline
* 'master' of gitorious.org:statusnet/mainline: problem with remote subscription on groups in OStatus show correct favorites link
This commit is contained in:
commit
985f52ce60
@ -69,6 +69,12 @@ class PopularNoticeSection extends NoticeSection
|
||||
|
||||
function moreUrl()
|
||||
{
|
||||
return common_local_url('favorited');
|
||||
if (common_config('singleuser', 'enabled')) {
|
||||
$user = User::singleUser();
|
||||
common_local_url('showfavorites', array('nickname' =>
|
||||
$user->nickname));
|
||||
} else {
|
||||
return common_local_url('favorited');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -246,7 +246,7 @@ class OStatusPlugin extends Plugin
|
||||
$cur = common_current_user();
|
||||
|
||||
if (empty($cur)) {
|
||||
$output->elementStart('li', 'entity_subscribe');
|
||||
$widget->out->elementStart('li', 'entity_subscribe');
|
||||
$profile = $peopletag->getTagger();
|
||||
$url = common_local_url('ostatusinit',
|
||||
array('group' => $group->nickname));
|
||||
@ -255,7 +255,7 @@ class OStatusPlugin extends Plugin
|
||||
// TRANS: Link to subscribe to a remote entity.
|
||||
_m('Subscribe'));
|
||||
|
||||
$output->elementEnd('li');
|
||||
$widget->out->elementEnd('li');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user