mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Adding patch from Ticket #2368
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4822 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
26b32ec999
commit
cc030bed0f
1 changed files with 1 additions and 1 deletions
|
@ -479,7 +479,7 @@ class Dispatcher extends Object {
|
||||||
} else {
|
} else {
|
||||||
if (defined('BASE_URL')) {
|
if (defined('BASE_URL')) {
|
||||||
$webroot = setUri();
|
$webroot = setUri();
|
||||||
$htaccess = preg_replace('/(?:'.APP_DIR.'(.*)|index\\.php(.*))/i', '', $webroot).APP_DIR.'/'.$webrootDirName.'/';
|
$htaccess = preg_replace('/(?:'.APP_DIR.'\\/(.*)|index\\.php(.*))/i', '', $webroot).APP_DIR.'/'.$webrootDirName.'/';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match('/^(.*)\\/'.$appDirName.'\\/'.$webrootDirName.'\\/index\\.php$/', $scriptName, $regs)) {
|
if (preg_match('/^(.*)\\/'.$appDirName.'\\/'.$webrootDirName.'\\/index\\.php$/', $scriptName, $regs)) {
|
||||||
|
|
Loading…
Reference in a new issue