From f7e98e742705921641f1d1ebb3b741fa823216d4 Mon Sep 17 00:00:00 2001 From: Hikkijp Date: Tue, 27 May 2014 17:25:28 -0300 Subject: [PATCH] Revert "Fixes bug described in #3581" This reverts commit e6c6e0bf2c541885f890968d6047974d587a422e. --- lib/Cake/Routing/Route/CakeRoute.php | 5 +---- lib/Cake/View/Helper/HtmlHelper.php | 1 - 2 files changed, 1 insertion(+), 5 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); diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index ee83328fe..6a8640bc8 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -334,7 +334,6 @@ class HtmlHelper extends AppHelper { $escapeTitle = true; if ($url !== null) { $url = $this->url($url); - $url = str_replace('%2F', '/', $url); } else { $url = $this->url($title); $title = htmlspecialchars_decode($url, ENT_QUOTES);