Fixing issues caused by not accessing the request object correctly.

cakephp · Nov 13, 2010 · 01894b3 · 01894b3
1 parent 18bb5f6
commit 01894b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
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];
@@ -1170,11 +1170,11 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
 			'defaults'	=> array_merge(array('limit' => 20, 'step' => 1), $defaults),
 			'options'	=> $options
 		);
-		if (!isset($this->request['paging'])) {
-			$this->request['paging'] = array();
+		if (!isset($this->request->params['paging'])) {
+			$this->request->params['paging'] = array();
 		}
-		$this->request['paging'] = array_merge(
-			(array)$this->request['paging'],
+		$this->request->params['paging'] = array_merge(
+			(array)$this->request->params['paging'],
 			array($object->alias => $paging)
 		);
 

diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
@@ -773,7 +773,7 @@ function testPaginateFieldsDouble(){
 			'recursive' => -1
 		);
 		$conditions = array();
-		$result = $Controller->paginate('ControllerPost',$conditions);
+		$result = $Controller->paginate('ControllerPost', $conditions);
 		$expected = array(
 			array(
 				'ControllerPost' => array(