From 4c175cc0bc37b5b0af30e9e34be261a534af1e5d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 1 Dec 2009 21:43:36 -0500
Subject: [PATCH] Removing code.

---
 cake/libs/router.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 40870331c..3415835f2 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -751,11 +751,6 @@ class Router {
 				}
 			}
 
-			if (array_key_exists('plugin', $url)) {
-				$params['plugin'] = $url['plugin'];
-			}
-
-			$backupUrl = $url;
 			$url += array('controller' => $params['controller'], 'plugin' => $params['plugin']);
 
 			if (isset($url['ext'])) {
@@ -769,7 +764,7 @@ class Router {
 				$originalUrl = $url;
 
 				if (isset($route->params['persist'], $params)) {
-					$url = $route->persistParams($url, array_merge($params, $backupUrl));
+					$url = $route->persistParams($url, $params);
 				}
 
 				if ($match = $route->match($url)) {
@@ -799,7 +794,7 @@ class Router {
 			}
 
 			if ($match === false) {
-				list($args, $named)  = array(Set::filter($args, true), Set::filter($named));
+				list($args, $named)  = array(Set::filter($args, true), Set::filter($named, true));
 				foreach ($self->__prefixes as $prefix) {
 					if (!empty($url[$prefix])) {
 						$url['action'] = str_replace($prefix . '_', '', $url['action']);