Moving extension data from params['extension'] to params['url']['extension']

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3400 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-08-12 17:03:40 +00:00
parent 34ec833441
commit 444adfdae8
2 changed files with 8 additions and 3 deletions

View file

@ -339,9 +339,14 @@ class Dispatcher extends Object {
if (isset($_GET)) {
if (ini_get('magic_quotes_gpc') == 1) {
$params['url'] = stripslashes_deep($_GET);
$url = stripslashes_deep($_GET);
} else {
$params['url'] = $_GET;
$url = $_GET;
}
if (isset($params['url'])) {
$params['url'] = am($params['url'], $url);
} else {
$params['url'] = $url;
}
}

View file

@ -224,7 +224,7 @@ class Router extends Object {
}
}
if (!empty($ext)) {
$out['extension'] = $ext;
$out['url']['extension'] = $ext;
}
return $out;
}