Merge pull request #17 from redd/master

Link generation is done by HtmlHelper::link() added escape and escapeTit...
torifat · Jul 6, 2014 · a4befe2 · a4befe2
2 parents fa0a604 + eb345b0
commit a4befe2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Test/Case/View/Helper/MenuBuilderHelperTest.php b/Test/Case/View/Helper/MenuBuilderHelperTest.php
@@ -1102,7 +1102,7 @@ public function testImageMenu() {
 			'</li',
 			'<li',
 			array('a' => array('title' => 'Item 2', 'href' => '/item-2')),
-			array('img' => array('src' => '/path/my-image.jpg', 'alt' => 'Item 2', 'title' => 'Item 2')),
+			array('img' => array('src' => '/path/my-image.jpg', 'alt' => 'Item 2')),
 			array('span' => array('class' => 'label')),
 			'Item 2',
 			'</span',

diff --git a/View/Helper/MenuBuilderHelper.php b/View/Helper/MenuBuilderHelper.php
@@ -279,24 +279,30 @@ protected function _buildItem(&$item, $pos = -1, &$isActive = false) {
 				}
 			}
 
-			$target = '';
+			$urlOptions = array('title' => $item['title']);
 			if (!empty($item['target'])) {
-				$target = ' target="' . $item['target'] . '"';
+				$urlOptions['target'] = $item['target'];
 			}
 
-			$linkClass = '';
 			if (!empty($item['linkClass'])) {
-				$linkClass = ' class="' . implode(' ', (array)$item['linkClass']) . '"';
+				$urlOptions['class'] = $item['linkClass'];
+			}
+
+			if (isset($item['escape'])) {
+				$urlOptions['escape'] = $item['escape'];
+			}
+
+			if (isset($item['escapeTitle'])) {
+				$urlOptions['escapeTitle'] = $item['escapeTitle'];
 			}
 
-			$url = '<a title="' . h($item['title']) . '" href="' . $this->Html->url($item['url']) . '"' . $target . $linkClass . '>';
 			if (!empty($item['image'])) {
-				$url .= $this->Html->image($item['image'], array('alt' => $item['title'], 'title' => $item['title']));
-				$url .= '<span class="label">' . h(__($item['title'])) . '</span>';
+				$urlOptions['escapeTitle'] = false;
+				$labelTitle = (isset($urlOptions['escape']) && $urlOptions['escape']) ? h($item['title']) : $item['title'];
+				$url = $this->Html->link($this->Html->image($item['image'], array('alt' => $item['title'])) . '<span class="label">' . $labelTitle . '</span>', $item['url'], $urlOptions);
 			} else {
-				$url .= h(__($item['title']));
+				$url = $this->Html->link($item['title'], $item['url'], $urlOptions);
 			}
-			$url .= '</a>';
 		}
 
 		if ($this->settings['indentHtmlOutput']) {