From 6c0dfe95926aafaa05ad4533562e9fb40007c73a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 9 Nov 2010 23:40:15 -0500
Subject: [PATCH] Fixing error where params[url] has moved.

---
 .../controller/components/request_handler.php  |  4 ++--
 cake/libs/controller/controller.php            |  2 +-
 .../cases/libs/controller/controller.test.php  | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index 93f11814a71..b68e5e33eab 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -121,8 +121,8 @@ function __construct(ComponentCollection $collection, $settings = array()) {
 	public function initialize(&$controller, $settings = array()) {
 		$this->request = $controller->request;
 		$this->response = $controller->response;
-		if (isset($controller->params['url']['ext'])) {
-			$this->ext = $controller->params['url']['ext'];
+		if (isset($this->request->params['url']['ext'])) {
+			$this->ext = $this->request->params['url']['ext'];
 		}
 		if (empty($this->ext)) {
 			$accepts = $this->request->accepts();
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 384220c4b97..ee9065b6d9c 100644
--- 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->request->params['url'], $this->passedArgs);
+		$options = array_merge($this->request->params, $this->request->query, $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 ae25b1c4863..345ba8440ba 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -610,7 +610,7 @@ function testPaginate() {
 		$Controller = new Controller($request);
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
 		$Controller->passedArgs[] = '1';
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->constructClasses();
 
 		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
@@ -700,7 +700,7 @@ function testPaginateExtraParams() {
 
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
 		$Controller->passedArgs[] = '1';
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->constructClasses();
 
 		$Controller->passedArgs = array('page' => '-1', 'contain' => array('ControllerComment'));
@@ -731,7 +731,7 @@ function testPaginateExtraParams() {
 
 		$Controller = new Controller($request);
 		$Controller->uses = array('ControllerPaginateModel');
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->constructClasses();
 		$Controller->paginate = array(
 			'ControllerPaginateModel' => array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id')
@@ -760,7 +760,7 @@ function testPaginateFieldsDouble(){
 		$Controller =& new Controller();
 		$Controller->uses = array('ControllerPost');
 		$Controller->request = $this->getMock('CakeRequest');
-		$Controller->request->params['url'] = array();
+		$Controller->request->query = array();
 		$Controller->constructClasses();
 
 		$Controller->paginate = array(
@@ -801,7 +801,7 @@ public function testPaginatePassedArgs() {
 		$Controller = new Controller($request);
 		$Controller->uses = array('ControllerPost');
 		$Controller->passedArgs[] = array('1', '2', '3');
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->constructClasses();
 
 		$Controller->paginate = array(
@@ -837,7 +837,7 @@ function testPaginateSpecialType() {
 		$Controller = new Controller($request);
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
 		$Controller->passedArgs[] = '1';
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->constructClasses();
 
 		$Controller->paginate = array('ControllerPost' => array('popular', 'fields' => array('id', 'title')));
@@ -861,7 +861,7 @@ function testDefaultPaginateParams() {
 		
 		$Controller = new Controller($request);
 		$Controller->modelClass = 'ControllerPost';
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->paginate = array('order' => 'ControllerPost.id DESC');
 		$Controller->constructClasses();
 		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
@@ -881,7 +881,7 @@ function testPaginateOrderVirtualField() {
 		
 		$Controller = new Controller($request);
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
-		$Controller->params['url'] = array();
+		$Controller->query = array();
 		$Controller->constructClasses();
 		$Controller->ControllerPost->virtualFields = array(
 			'offset_test' => 'ControllerPost.id + 1'
@@ -1499,7 +1499,7 @@ function testRequestHandlerPrefers(){
 
 		$Controller->components = array("RequestHandler");
 		$Controller->modelClass='ControllerPost';
-		$Controller->params['url'] = array('ext' => 'rss');
+		$Controller->request->params['url'] = array('ext' => 'rss');
 		$Controller->constructClasses();
 		$Controller->Components->trigger('initialize', array(&$Controller));
 		$Controller->beforeFilter();