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:
phpnut 2007-04-08 04:13:28 +00:00
parent 26b32ec999
commit cc030bed0f

View file

@ -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)) {