]> git.mxchange.org Git - friendica.git/commitdiff
fix #1222
authorFabrixxm <fabrix.xm@gmail.com>
Mon, 10 Nov 2014 14:37:52 +0000 (15:37 +0100)
committerFabrixxm <fabrix.xm@gmail.com>
Mon, 10 Nov 2014 14:37:52 +0000 (15:37 +0100)
mod/network.php

index 71f9f25789a40c5c1b9ead13a41f2eab13f3fec1..1cb72aebab4e92ad447c89093c9b7124d26e8b60 100644 (file)
@@ -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']);