Fix duplicated webroot path on HtmlHelper::meta('icon').

cakephp · Nov 19, 2013 · 4677ddf · 4677ddf
1 parent df52e85
commit 4677ddf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -1757,6 +1757,14 @@ public function testMetaIcon() {
 			)
 		);
 		$this->assertTags($result, $expected);
+
+		$this->Html->request->webroot = '/testing/';
+		$result = $this->Html->meta('icon');
+		$expected = array(
+			'link' => array('href' => '/testing/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'icon'),
+			array('link' => array('href' => '/testing/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'shortcut icon'))
+		);
+		$this->assertTags($result, $expected);
 	}
 
 /**

diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php
@@ -253,7 +253,7 @@ public function meta($type, $url = null, $options = array()) {
 			);
 
 			if ($type === 'icon' && $url === null) {
-				$types['icon']['link'] = $this->webroot('favicon.ico');
+				$types['icon']['link'] = 'favicon.ico';
 			}
 
 			if (isset($types[$type])) {