From 952c7192f4a9746244625362d65d7844f2c86825 Mon Sep 17 00:00:00 2001 From: Hikkijp Date: Tue, 27 May 2014 14:00:20 -0300 Subject: [PATCH] Revert "Fixes bug described in #3581" This reverts commit 6c75e3697d5b0d70ed0cc73403b16d2812bd02ad. --- lib/Cake/Routing/Route/CakeRoute.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Cake/Routing/Route/CakeRoute.php b/lib/Cake/Routing/Route/CakeRoute.php index 47bd57e6b..74595c400 100644 --- a/lib/Cake/Routing/Route/CakeRoute.php +++ b/lib/Cake/Routing/Route/CakeRoute.php @@ -536,10 +536,7 @@ class CakeRoute { $out = str_replace($search, $replace, $out); } - if (strpos($this->template, '**')) { - $out = str_replace('**', $params['pass'], $out); - } - elseif (strpos($this->template, '*')) { + if (strpos($this->template, '*')) { $out = str_replace('*', $params['pass'], $out); } $out = str_replace('//', '/', $out);