Commit 6145df66 authored by Evan Prodromou's avatar Evan Prodromou

trim initial '/' from paths

parent 5c852b87
......@@ -49,21 +49,33 @@ $action = null;
function getPath($req)
{
$p = null;
if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
&& array_key_exists('p', $req)
) {
return $req['p'];
$p = $req['p'];
} else if (array_key_exists('PATH_INFO', $_SERVER)) {
$path = $_SERVER['PATH_INFO'];
$script = $_SERVER['SCRIPT_NAME'];
if (substr($path, 0, mb_strlen($script)) == $script) {
return substr($path, mb_strlen($script));
$p = substr($path, mb_strlen($script));
} else {
return $path;
$p = $path;
}
} else {
return null;
$p = null;
}
// Trim all initial '/'
if (!empty($p)) {
while ($p[0] == '/') {
$p = substr($p, 1);
}
}
return $p;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment