diff --git a/MatomoTracker.php b/MatomoTracker.php index 0e4f41b..86ef1ca 100644 --- a/MatomoTracker.php +++ b/MatomoTracker.php @@ -2324,16 +2324,14 @@ protected function getCookieMatchingName(string $name) protected static function getCurrentScriptName(): string { $url = ''; - if (!empty($_SERVER['PATH_INFO'])) { - $url = $_SERVER['PATH_INFO']; - } else { - if (!empty($_SERVER['REQUEST_URI'])) { - if (($pos = strpos($_SERVER['REQUEST_URI'], '?')) !== false) { - $url = substr($_SERVER['REQUEST_URI'], 0, $pos); - } else { - $url = $_SERVER['REQUEST_URI']; - } + if (!empty($_SERVER['REQUEST_URI'])) { + if (($pos = strpos($_SERVER['REQUEST_URI'], '?')) !== false) { + $url = substr($_SERVER['REQUEST_URI'], 0, $pos); + } else { + $url = $_SERVER['REQUEST_URI']; } + } elseif (!empty($_SERVER['PATH_INFO'])) { + $url = $_SERVER['PATH_INFO']; } if (empty($url) && isset($_SERVER['SCRIPT_NAME'])) { $url = $_SERVER['SCRIPT_NAME'];