friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

fix use of $->query_string

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

6
mod/dfrn_request.php
View File

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

7
mod/network.php
View File

@ -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(); $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); array_shift($query_array);
// fetch last used network view and redirect if needed // fetch last used network view and redirect if needed
@ -300,8 +301,8 @@ function network_content(&$a, $update = 0) {
return login(false); return login(false);
} }
// TODO:is this really necessary? $a is already available to hooks
$arr = array('query' => $a->query_string); $arr = array('query' => $a->query_string);
call_hooks('network_content_init', $arr); call_hooks('network_content_init', $arr);