mirror of
https://github.com/slawkens/myaac.git
synced 2025-05-03 12:49:20 +02:00
Merge branch 'develop' into feature/settings
This commit is contained in:
commit
44d5d7ae64
@ -29,7 +29,7 @@ require_once SYSTEM . 'functions.php';
|
|||||||
|
|
||||||
$uri = $_SERVER['REQUEST_URI'];
|
$uri = $_SERVER['REQUEST_URI'];
|
||||||
if(false !== strpos($uri, 'index.php')) {
|
if(false !== strpos($uri, 'index.php')) {
|
||||||
$uri = str_replace_first('index.php', '', $uri);
|
$uri = str_replace_first('/index.php', '', $uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(0 === strpos($uri, '/')) {
|
if(0 === strpos($uri, '/')) {
|
||||||
|
@ -51,7 +51,11 @@ if (false !== $pos = strpos($uri, '?')) {
|
|||||||
$uri = rawurldecode($uri);
|
$uri = rawurldecode($uri);
|
||||||
if (BASE_DIR !== '') {
|
if (BASE_DIR !== '') {
|
||||||
$tmp = str_replace_first('/', '', 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);
|
define('URI', $uri);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user