wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' into 0.9.x

Browse Source
This commit is contained in:
Evan Prodromou 2010-09-06 10:11:59 -04:00
commit 80044ad735
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
index.php
View File

@ -210,12 +210,12 @@ function main()
if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') { if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {
$_lighty_path = preg_replace('/^'.preg_quote(common_config('site', 'path')).'\//', '', substr($_lighty_url['path'], 1)); $_lighty_path = preg_replace('/^'.preg_quote(common_config('site', 'path')).'\//', '', substr($_lighty_url['path'], 1));
$_SERVER['QUERY_STRING'] = 'p='.$_lighty_path; $_SERVER['QUERY_STRING'] = 'p='.$_lighty_path;
if ($_lighty_url['query']) { if (isset($_lighty_url['query']) && $_lighty_url['query'] != '') {
$_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query']; $_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query'];
} parse_str($_lighty_url['query'], $_lighty_query);
parse_str($_lighty_url['query'], $_lighty_query); foreach ($_lighty_query as $key => $val) {
foreach ($_lighty_query as $key => $val) { $_GET[$key] = $_REQUEST[$key] = $val;
$_GET[$key] = $_REQUEST[$key] = $val; }
} }
$_GET['p'] = $_REQUEST['p'] = $_lighty_path; $_GET['p'] = $_REQUEST['p'] = $_lighty_path;
} }