From 6026e75009c90cc6f643d6608027209e59d9338e Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Wed, 14 Jan 2009 18:27:14 +0000
Subject: [PATCH] fixing preg error in Router::normalize cause by last commit

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7984 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/router.php                  | 2 +-
 cake/tests/cases/libs/router.test.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 855c4aaf7..35587fe04 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -1179,7 +1179,7 @@ class Router extends Object {
 		$paths = Router::getPaths();
 
 		if (!empty($paths['base']) && stristr($url, $paths['base'])) {
-			$url = preg_replace("/{$paths['base']}/", '', $url, 1);
+			$url = preg_replace('/' . preg_quote($paths['base'], '/') . '/', '', $url, 1);
 		}
 		$url = '/' . $url;
 
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 1b306ab35..c9b88268f 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -271,6 +271,12 @@ class RouterTest extends CakeTestCase {
 		$result = Router::normalize('/us/users/logout/');
 		$this->assertEqual($result, '/users/logout');
 
+		Router::reload();
+
+		Router::setRequestInfo(array(array(), array('base' => '/cake_12')));
+		$result = Router::normalize('/cake_12/users/logout/');
+		$this->assertEqual($result, '/users/logout');
+
 	}
 /**
  * testUrlGeneration method