Fixes bug described in #3581

Routes with '/**' are now correctly handled by the HtmlHelper->link()
cakephp · May 27, 2014 · e6c6e0b · e6c6e0b
1 parent 952c719
commit e6c6e0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Cake/Routing/Route/CakeRoute.php b/lib/Cake/Routing/Route/CakeRoute.php
@@ -536,7 +536,10 @@ protected function _writeUrl($params) {
 			$out = str_replace($search, $replace, $out);
 		}
 
-		if (strpos($this->template, '*')) {
+		if (strpos($this->template, '**')) {
+			$out = str_replace('**', $params['pass'], $out);
+		} 
+		elseif (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
@@ -334,6 +334,7 @@ public function link($title, $url = null, $options = array(), $confirmMessage =
 		$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);