From 22497eb41c45c91ff8850a674487094259fd50ea Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 6 Nov 2010 23:57:35 -0400
Subject: [PATCH] Fixing failing tests in controller test.

---
 cake/libs/controller/controller.php                  | 2 +-
 cake/tests/cases/libs/controller/controller.test.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index a0cd556b9..384220c4b 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -1039,7 +1039,7 @@ class Controller extends Object {
 			), E_USER_WARNING);
 			return array();
 		}
-		$options = array_merge($this->request->params, $this->params['url'], $this->passedArgs);
+		$options = array_merge($this->request->params, $this->request->params['url'], $this->passedArgs);
 
 		if (isset($this->paginate[$object->alias])) {
 			$defaults = $this->paginate[$object->alias];
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 8bfcbe0d7..ae25b1c48 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -759,6 +759,7 @@ class ControllerTest extends CakeTestCase {
 	function testPaginateFieldsDouble(){
 		$Controller =& new Controller();
 		$Controller->uses = array('ControllerPost');
+		$Controller->request = $this->getMock('CakeRequest');
 		$Controller->request->params['url'] = array();
 		$Controller->constructClasses();