From 84e93602de3b3eebae707500cb494a252459deb6 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 10 Nov 2014 15:07:35 +0100 Subject: [PATCH 1/2] small indentation fix --- mod/network.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mod/network.php b/mod/network.php index bff30f7fc3..71f9f25789 100644 --- a/mod/network.php +++ b/mod/network.php @@ -16,11 +16,11 @@ function network_init(&$a) { } } - // convert query string to array. remove friendica args - $query_array = array(); - $query_string = str_replace($a->cmd."?", "", $a->query_string); - parse_str($query_string, $query_array); - array_shift($query_array); + // convert query string to array. remove friendica args + $query_array = array(); + $query_string = str_replace($a->cmd."?", "", $a->query_string); + parse_str($query_string, $query_array); + array_shift($query_array); // fetch last used network view and redirect if needed if(! $is_a_date_query) { @@ -73,11 +73,11 @@ function network_init(&$a) { $net_baseurl .= $tab_baseurls[$k]; - // parse out tab queries - $dest_qa = array(); - $dest_qs = $tab_args[$k]; - parse_str( $dest_qs, $dest_qa); - $net_args = array_merge($net_args, $dest_qa); + // parse out tab queries + $dest_qa = array(); + $dest_qs = $tab_args[$k]; + parse_str( $dest_qs, $dest_qa); + $net_args = array_merge($net_args, $dest_qa); } else if($sel_tabs[4] === 'active') { // The '/new' tab is selected From 2fee5966f1544d493420a735687bcee48d6baec2 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 10 Nov 2014 15:37:52 +0100 Subject: [PATCH 2/2] fix #1222 --- mod/network.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mod/network.php b/mod/network.php index 71f9f25789..1cb72aebab 100644 --- a/mod/network.php +++ b/mod/network.php @@ -22,6 +22,7 @@ function network_init(&$a) { parse_str($query_string, $query_array); array_shift($query_array); + // fetch last used network view and redirect if needed if(! $is_a_date_query) { $sel_tabs = network_query_get_sel_tab($a); @@ -44,7 +45,7 @@ function network_init(&$a) { else if($sel_groups !== false) { $net_baseurl .= '/' . $sel_groups; } - + if($remember_tab) { // redirect if current selected tab is '/network' and // last selected tab is _not_ '/network?f=&order=comment'. @@ -87,16 +88,20 @@ function network_init(&$a) { if($remember_net) { $net_args['nets'] = $last_sel_nets; } - + else if($sel_nets!==false) { + $net_args['nets'] = $sel_nets; + } + if($remember_tab || $remember_net || $remember_group) { $net_args = array_merge($query_array, $net_args); $net_queries = build_querystring($net_args); - + $redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl); + goaway($a->get_baseurl() . $redir_url); } } - + if(x($_GET['nets']) && $_GET['nets'] === 'all') unset($_GET['nets']);