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

Merge branch 'master' of gitorious.org:statusnet/mainline

Browse Source 
* 'master' of gitorious.org:statusnet/mainline:
  problem with remote subscription on groups in OStatus
  show correct favorites link
This commit is contained in:
Zach Copley 2011-09-17 14:39:26 -07:00
commit 985f52ce60
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/popularnoticesection.php
View File

@ -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');
}
} }
} }

4
plugins/OStatus/OStatusPlugin.php
View File

@ -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
// 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;
} }