Fix #1190

diff --git a/boot.php b/boot.php
index 0d7c6e878fafa402d743c5bce0d04f0a8eeb5059..0dee716e77457320ecc0bf5e5c85f505ad5643a7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -522,21 +522,28 @@ if(! class_exists('App')) {
                                if (substr($this->query_string, 0, 1) == "/")
                                        $this->query_string = substr($this->query_string, 1);
                        }
+                        
                        if (x($_GET,'pagename'))
                                $this->cmd = trim($_GET['pagename'],'/\\');
                        elseif (x($_GET,'q'))
                                $this->cmd = trim($_GET['q'],'/\\');
-
+                            
+                        
+                        // fix query_string
+                        $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
+                        
+                        
                        // unix style "homedir"
-
+                        
                        if(substr($this->cmd,0,1) === '~')
-                               $this->cmd = 'profile/' . substr($this->cmd,1);
-
+                               $this->cmd = 'profile/' . substr($this->cmd,1);
+                        
                        // Diaspora style profile url
 
                        if(substr($this->cmd,0,2) === 'u/')
                                $this->cmd = 'profile/' . substr($this->cmd,2);
 
+                                
                        /**
                         *
                         * Break the URL path into C style argc/argv style arguments for our

diff --git a/mod/network.php b/mod/network.php
index ab44073508c572dba438a74b753a8944f7e7a5eb..b38824e679936d35b6e1b1c646b13f278b803f2e 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -297,7 +297,7 @@ function network_content(&$a, $update = 0) {
 
        if(! local_user()) {
                $_SESSION['return_url'] = $a->query_string;
-       return login(false);
+               return login(false);
        }
 
        $arr = array('query' => $a->query_string);