diff options
| author | friendica <info@friendica.com> | 2014-01-22 14:52:31 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-22 14:52:31 -0800 |
| commit | e4bce90b538d59ba108a1c054a7691f6d4bef15a (patch) | |
| tree | b8637d7977a4246b5da83ca7ddf600c182d4e903 | |
| parent | 927098ae1946d593de3dd04bd40e3925d57299d8 (diff) | |
| parent | 040d87c999c02df82dd3acad97db498d12f8580a (diff) | |
| download | volse-hubzilla-e4bce90b538d59ba108a1c054a7691f6d4bef15a.tar.gz volse-hubzilla-e4bce90b538d59ba108a1c054a7691f6d4bef15a.tar.bz2 volse-hubzilla-e4bce90b538d59ba108a1c054a7691f6d4bef15a.zip | |
Merge pull request #279 from git-marijus/master
make network tabs regard selected group (collection) and vice versa
| -rw-r--r-- | include/conversation.php | 8 | ||||
| -rw-r--r-- | include/group.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 13f0d8970..46a01d3c9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1377,26 +1377,26 @@ function network_tabs() { $tabs = array( array( 'label' => t('Commented Order'), - 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel'=>$all_active, 'title'=> t('Sort by Comment Date'), ), array( 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel'=>$postord_active, 'title' => t('Sort by Post Date'), ), array( 'label' => t('Personal'), - 'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', + 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), ), array( 'label' => t('New'), - 'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&new=1', + 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), ), diff --git a/include/group.php b/include/group.php index cdd779df2..56a7555bc 100644 --- a/include/group.php +++ b/include/group.php @@ -272,7 +272,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id 'cid' => $cid, 'text' => $rr['name'], 'selected' => $selected, - 'href' => (($mode == 0) ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']), + 'href' => (($mode == 0) ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']) . ((x($_GET,'new')) ? '&new=' . $_GET['new'] : '') . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : ''), 'edit' => $groupedit, 'ismember' => in_array($rr['id'],$member_of), ); |