Merge branch 'develop' into feature/settings

This commit is contained in:
slawkens 2023-05-13 12:57:11 +02:00
commit 44d5d7ae64
2 changed files with 6 additions and 2 deletions

View File

@ -29,7 +29,7 @@ require_once SYSTEM . 'functions.php';
$uri = $_SERVER['REQUEST_URI'];
if(false !== strpos($uri, 'index.php')) {
$uri = str_replace_first('index.php', '', $uri);
$uri = str_replace_first('/index.php', '', $uri);
}
if(0 === strpos($uri, '/')) {

View File

@ -51,7 +51,11 @@ if (false !== $pos = strpos($uri, '?')) {
$uri = rawurldecode($uri);
if (BASE_DIR !== '') {
$tmp = str_replace_first('/', '', BASE_DIR);
$uri = str_replace_first($tmp . '/', '', $uri);
$uri = str_replace_first($tmp, '', $uri);
}
if(0 === strpos($uri, '/')) {
$uri = str_replace_first('/', '', $uri);
}
define('URI', $uri);