From 3a7ccff571d09b7f0f8118880dd10ca91da1df70 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 23 Oct 2008 02:05:34 +0000
Subject: [PATCH] Minor refactor to earlier code.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7773 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/object.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/object.php b/cake/libs/object.php
index e1bf8a28c..f5b722373 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -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;