clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #1190

This commit is contained in:
Fabrixxm 2014-10-22 09:04:32 +02:00
parent 295b4d7f61
commit 63168905ec
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
boot.php
View File

@ -522,21 +522,28 @@ if(! class_exists('App')) {
if (substr($this->query_string, 0, 1) == "/") if (substr($this->query_string, 0, 1) == "/")
$this->query_string = substr($this->query_string, 1); $this->query_string = substr($this->query_string, 1);
} }
if (x($_GET,'pagename')) if (x($_GET,'pagename'))
$this->cmd = trim($_GET['pagename'],'/\\'); $this->cmd = trim($_GET['pagename'],'/\\');
elseif (x($_GET,'q')) elseif (x($_GET,'q'))
$this->cmd = trim($_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" // unix style "homedir"
if(substr($this->cmd,0,1) === '~') if(substr($this->cmd,0,1) === '~')
$this->cmd = 'profile/' . substr($this->cmd,1); $this->cmd = 'profile/' . substr($this->cmd,1);
// Diaspora style profile url // Diaspora style profile url
if(substr($this->cmd,0,2) === 'u/') if(substr($this->cmd,0,2) === 'u/')
$this->cmd = 'profile/' . substr($this->cmd,2); $this->cmd = 'profile/' . substr($this->cmd,2);
/** /**
* *
* Break the URL path into C style argc/argv style arguments for our * Break the URL path into C style argc/argv style arguments for our

2
mod/network.php
View File

@ -297,7 +297,7 @@ function network_content(&$a, $update = 0) {
if(! local_user()) { if(! local_user()) {
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
return login(false); return login(false);
} }
$arr = array('query' => $a->query_string); $arr = array('query' => $a->query_string);