fix use of $->query_string

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 5e19a1ffc1d25a0a9ca96e0e1a8d6e875063029c..aee8c0306f28cfedeb9850f7a7387d2009d292d9 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -648,12 +648,8 @@ function dfrn_request_content(&$a) {
 
                if(! local_user()) {
                        info( t("Please login to confirm introduction.") . EOL );
-
                        /* setup the return URL to come back to this page if they use openid */
-
-                       $stripped = str_replace('q=','',$a->query_string);
-                       $_SESSION['return_url'] = trim($stripped,'/');
-
+                       $_SESSION['return_url'] = $a->query_string;
                        return login();
                }
 

diff --git a/mod/network.php b/mod/network.php
index b38824e679936d35b6e1b1c646b13f278b803f2e..bff30f7fc36c2ce331a23385a39399102e35064b 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -16,9 +16,10 @@ function network_init(&$a) {
                }
        }
 
-    // convert query string to array and remove first element (which is friendica args)
+    // convert query string to array. remove friendica args
     $query_array = array();
-    parse_str($a->query_string, $query_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
@@ -300,8 +301,8 @@ function network_content(&$a, $update = 0) {
                return login(false);
        }
 
+       // TODO:is this really necessary? $a is already available to hooks
        $arr = array('query' => $a->query_string);
-
        call_hooks('network_content_init', $arr);