bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #1223 from fabrixxm/issue/1222

Browse source 
Issue/1222
This commit is contained in:
Michael Vogel 2014-11-10 16:01:13 +01:00
parent fd61391e3e 2fee5966f1
commit 1d512f3ba2
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mod/network.php
View file

@ -16,11 +16,12 @@ function network_init(&$a) {
} }
} }
// convert query string to array. remove friendica args // convert query string to array. remove friendica args
$query_array = array(); $query_array = array();
$query_string = str_replace($a->cmd."?", "", $a->query_string); $query_string = str_replace($a->cmd."?", "", $a->query_string);
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) {
@ -73,11 +74,11 @@ function network_init(&$a) {
$net_baseurl .= $tab_baseurls[$k]; $net_baseurl .= $tab_baseurls[$k];
// parse out tab queries // parse out tab queries
$dest_qa = array(); $dest_qa = array();
$dest_qs = $tab_args[$k]; $dest_qs = $tab_args[$k];
parse_str( $dest_qs, $dest_qa); parse_str( $dest_qs, $dest_qa);
$net_args = array_merge($net_args, $dest_qa); $net_args = array_merge($net_args, $dest_qa);
} }
else if($sel_tabs[4] === 'active') { else if($sel_tabs[4] === 'active') {
// The '/new' tab is selected // The '/new' tab is selected
@ -87,12 +88,16 @@ 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);
} }
} }