Fixing failing tests in controller test.

cakephp · Nov 7, 2010 · 22497eb · 22497eb
1 parent 88c717d
commit 22497eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
@@ -1039,7 +1039,7 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
 			), 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
@@ -759,6 +759,7 @@ function testPaginateExtraParams() {
 	function testPaginateFieldsDouble(){
 		$Controller =& new Controller();
 		$Controller->uses = array('ControllerPost');
+		$Controller->request = $this->getMock('CakeRequest');
 		$Controller->request->params['url'] = array();
 		$Controller->constructClasses();