From 444adfdae8eb515c37d3366d4861cb6bff151f07 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Sat, 12 Aug 2006 17:03:40 +0000
Subject: [PATCH] Moving extension data from params['extension'] to
 params['url']['extension']

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3400 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/dispatcher.php  | 9 +++++++--
 cake/libs/router.php | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index c0c32b006..1fc9e2aad 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -339,9 +339,14 @@ class Dispatcher extends Object {
 
 		if (isset($_GET)) {
 			if (ini_get('magic_quotes_gpc') == 1) {
-				$params['url'] = stripslashes_deep($_GET);
+				$url = stripslashes_deep($_GET);
 			} else {
-				$params['url'] = $_GET;
+				$url = $_GET;
+			}
+			if (isset($params['url'])) {
+				$params['url'] = am($params['url'], $url);
+			} else {
+				$params['url'] = $url;
 			}
 		}
 
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 187adb807..524cf9ce8 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -224,7 +224,7 @@ class Router extends Object {
 			}
 		}
 		if (!empty($ext)) {
-			$out['extension'] = $ext;
+			$out['url']['extension'] = $ext;
 		}
 		return $out;
 	}