Browse Source

fix use of $->query_string

pull/1198/head
Fabrixxm 7 years ago
parent
commit
f7cf72e450
2 changed files with 5 additions and 8 deletions
  1. +1
    -5
      mod/dfrn_request.php
  2. +4
    -3
      mod/network.php

+ 1
- 5
mod/dfrn_request.php View File

@ -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();
}


+ 4
- 3
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();
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);


Loading…
Cancel
Save