GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into 1.0.x

This commit is contained in:
Evan Prodromou 2011-10-03 09:32:24 -04:00
parent 2930484d4f c9d635b675
commit d852e871f5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.php
View File

@ -49,21 +49,29 @@ $action = null;
function getPath($req) function getPath($req)
{ {
$p = null;
if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER)) if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
&& array_key_exists('p', $req) && array_key_exists('p', $req)
) { ) {
return $req['p']; $p = $req['p'];
} else if (array_key_exists('PATH_INFO', $_SERVER)) { } else if (array_key_exists('PATH_INFO', $_SERVER)) {
$path = $_SERVER['PATH_INFO']; $path = $_SERVER['PATH_INFO'];
$script = $_SERVER['SCRIPT_NAME']; $script = $_SERVER['SCRIPT_NAME'];
if (substr($path, 0, mb_strlen($script)) == $script) { if (substr($path, 0, mb_strlen($script)) == $script) {
return substr($path, mb_strlen($script)); $p = substr($path, mb_strlen($script) + 1);
} else { } else {
return $path; $p = $path;
} }
} else { } else {
return null; $p = null;
} }
// Trim all initial '/'
$p = ltrim($p, '/');
return $p;
} }
/** /**