mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Minor refactor to earlier code.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7773 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
1b456f2cf1
commit
3a7ccff571
1 changed files with 2 additions and 2 deletions
|
@ -94,8 +94,8 @@ class Object {
|
|||
if (in_array('return', $extra, true)) {
|
||||
$extra = array_merge($extra, array('return' => 0, 'autoRender' => 1));
|
||||
}
|
||||
if (is_array($url)) {
|
||||
$extra = array_merge(array('url' => array()), $extra);
|
||||
if (is_array($url) && !isset($extra['url'])) {
|
||||
$extra['url'] = array();
|
||||
}
|
||||
$params = array_merge(array('autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1), $extra);
|
||||
$dispatcher = new Dispatcher;
|
||||
|
|
Loading…
Reference in a new issue