Fix urlpath determination on the root page

This commit is contained in:
Hypolite Petovan 2018-07-11 22:23:57 -04:00
parent 39767fb366
commit bd04c03c9f

View file

@ -442,8 +442,14 @@ class App
* *
* To get /path/to/friendica we perform dirname() for as many levels as there are slashes in the QUERY_STRING * To get /path/to/friendica we perform dirname() for as many levels as there are slashes in the QUERY_STRING
*/ */
if (!empty($_SERVER['SCRIPT_URL']) && !empty($_SERVER['QUERY_STRING'])) { if (!empty($_SERVER['SCRIPT_URL'])) {
$path = trim(dirname($_SERVER['SCRIPT_URL'], substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/'); // Module
if (!empty($_SERVER['QUERY_STRING'])) {
$path = trim(dirname($_SERVER['SCRIPT_URL'], substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/');
} else {
// Root page
$path = trim($_SERVER['SCRIPT_URL'], '/');
}
if ($path && $path != $this->urlpath) { if ($path && $path != $this->urlpath) {
$this->urlpath = $path; $this->urlpath = $path;