Merge pull request #23 from betweenbrain/develop

Merge develop for 1.1.2 release

helper.php

@@ -316,33 +316,33 @@ public function render($item, $containerTag = '<ul>', $containerClass = 'menu',
 	private function startOutput($item, $itemOpenTag)
 	{
 
-		$browserNav  = property_exists($item, 'browserNav') ? $this->setBrowsernav($item) : '';
-		$item->title = property_exists($item, 'menu_image') ? $this->setTitle($item) : $item->title;
+		$browserNav = property_exists($item, 'browserNav') ? $this->setBrowsernav($item) : '';
+		$title      = property_exists($item, 'menu_image') && $item->menu_image != '' ? $this->setImage($item) : $item->title;
 
 		switch ($item->type)
 		{
 			case 'alias':
-				$output = $itemOpenTag . '<a ' . $browserNav . ' href="index.php?Itemid=' . $item->params->get('aliasoptions') . '"/>' . $item->title . '</a>';
+				$output = $itemOpenTag . '<a ' . $browserNav . ' href="index.php?Itemid=' . $item->params->get('aliasoptions') . '">' . $title . '</a>';
 				break;
 
 			case 'separator':
-				$output = $itemOpenTag . '<span class="separator">' . $item->title . '</span>';
+				$output = $itemOpenTag . '<span class="separator">' . $title . '</span>';
 				break;
 
 			case 'url' :
 				if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false))
 				{
-					$output = $itemOpenTag . '<a ' . $browserNav . ' href="' . JRoute::_($item->link . '&Itemid=' . $item->id) . '"/>' . $item->title . '</a>';
+					$output = $itemOpenTag . '<a ' . $browserNav . ' href="' . JRoute::_($item->link . '&Itemid=' . $item->id) . '">' . $title . '</a>';
 				}
 				else
 				{
-					$output = $itemOpenTag . '<a ' . $browserNav . ' href="' . $item->link . '"/>' . $item->title . '</a>';
+					$output = $itemOpenTag . '<a ' . $browserNav . ' href="' . $item->link . '">' . $title . '</a>';
 				}
 				break;
 
 			default:
-				$item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id;
-				$output     = $itemOpenTag . '<a ' . $browserNav . ' href="' . JRoute::_($item->link) . '"/>' . $item->title . '</a>';
+				$link   = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id;
+				$output = $itemOpenTag . '<a ' . $browserNav . ' href="' . JRoute::_($link) . '">' . $title . '</a>';
 				break;
 		}
 
@@ -398,16 +398,14 @@ private function setNullProperties($items)
 	 *
 	 * @return string
 	 */
-	private function setTitle($item)
+	private function setImage($item)
 	{
 		if ($item->menu_image)
 		{
-			$item->params->get('menu_text', 1) ?
-				$item->title = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" /><span class="image-title">' . $item->title . '</span> ' :
-				$item->title = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" />';
+			return $item->params->get('menu_text', 1) ?
+				'<img src="' . $item->menu_image . '" alt="' . $item->title . '" /><span class="image-title">' . $item->title . '</span> ' :
+				'<img src="' . $item->menu_image . '" alt="' . $item->title . '" />';
 		}
-
-		return $item->title;
 	}
 
 }

mod_menuwrench.xml

@@ -3,12 +3,12 @@
            version="2.5"
            method="upgrade">
 	<name>Menu Wrench</name>
-	<creationDate>July 28, 2014</creationDate>
+	<creationDate>September 19, 2014</creationDate>
 	<author>Matt Thomas</author>
 	<authorUrl>http://betweenbrain.com</authorUrl>
 	<copyright>Copyright (C) 2013-2014 betweenbrain llc. All rights reserved.</copyright>
 	<license>GNU General Public License version 2, or later.</license>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<description>MOD_MENU_WRENCH_DESC</description>
 
 	<files>

tmpl/default.php

@@ -9,7 +9,7 @@
  * License    GNU GPL v2 or later
  */
 ?>
-<ul class="menu">
+<ul class="menu<?php echo htmlspecialchars($params->get('moduleclass_sfx'))?>">
 	<?php foreach ($items as $item) {
 		echo $helper->render($item, '<ul>', 'menu', '<li>');
 	}