MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix #1222

Browse source
This commit is contained in:
Fabrixxm 2014-11-10 15:37:52 +01:00
parent 84e93602de
commit 2fee5966f1
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mod/network.php
View file

@ -22,6 +22,7 @@ function network_init(&$a) {
parse_str($query_string, $query_array); parse_str($query_string, $query_array);
array_shift($query_array); array_shift($query_array);
// fetch last used network view and redirect if needed // fetch last used network view and redirect if needed
if(! $is_a_date_query) { if(! $is_a_date_query) {
$sel_tabs = network_query_get_sel_tab($a); $sel_tabs = network_query_get_sel_tab($a);
@ -44,7 +45,7 @@ function network_init(&$a) {
else if($sel_groups !== false) { else if($sel_groups !== false) {
$net_baseurl .= '/' . $sel_groups; $net_baseurl .= '/' . $sel_groups;
} }
if($remember_tab) { if($remember_tab) {
// redirect if current selected tab is '/network' and // redirect if current selected tab is '/network' and
// last selected tab is _not_ '/network?f=&order=comment'. // last selected tab is _not_ '/network?f=&order=comment'.
@ -87,16 +88,20 @@ function network_init(&$a) {
if($remember_net) { if($remember_net) {
$net_args['nets'] = $last_sel_nets; $net_args['nets'] = $last_sel_nets;
} }
else if($sel_nets!==false) {
$net_args['nets'] = $sel_nets;
}
if($remember_tab || $remember_net || $remember_group) { if($remember_tab || $remember_net || $remember_group) {
$net_args = array_merge($query_array, $net_args); $net_args = array_merge($query_array, $net_args);
$net_queries = build_querystring($net_args); $net_queries = build_querystring($net_args);
$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl); $redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
goaway($a->get_baseurl() . $redir_url); goaway($a->get_baseurl() . $redir_url);
} }
} }
if(x($_GET['nets']) && $_GET['nets'] === 'all') if(x($_GET['nets']) && $_GET['nets'] === 'all')
unset($_GET['nets']); unset($_GET['nets']);