We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 985f52ce authored by Zach Copley's avatar Zach Copley

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
parents 44676150 f52d3375
...@@ -69,6 +69,12 @@ class PopularNoticeSection extends NoticeSection ...@@ -69,6 +69,12 @@ class PopularNoticeSection extends NoticeSection
function moreUrl() 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 ...@@ -246,7 +246,7 @@ class OStatusPlugin extends Plugin
$cur = common_current_user(); $cur = common_current_user();
if (empty($cur)) { if (empty($cur)) {
$output->elementStart('li', 'entity_subscribe'); $widget->out->elementStart('li', 'entity_subscribe');
$profile = $peopletag->getTagger(); $profile = $peopletag->getTagger();
$url = common_local_url('ostatusinit', $url = common_local_url('ostatusinit',
array('group' => $group->nickname)); array('group' => $group->nickname));
...@@ -255,7 +255,7 @@ class OStatusPlugin extends Plugin ...@@ -255,7 +255,7 @@ class OStatusPlugin extends Plugin
// TRANS: Link to subscribe to a remote entity. // TRANS: Link to subscribe to a remote entity.
_m('Subscribe')); _m('Subscribe'));
$output->elementEnd('li'); $widget->out->elementEnd('li');
return false; return false;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment