From 64762fd890e8482319190af55518699c384a4d7a Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Thu, 10 Jul 2014 14:54:41 -0400
Subject: [PATCH 01/14] Implements adding category items as sub-menu items

---
 helper.php | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/helper.php b/helper.php
index c9aeae3..175fd2e 100644
--- a/helper.php
+++ b/helper.php
@@ -25,6 +25,7 @@ class modMenuwrenchHelper
 	public function __construct($params)
 	{
 		$this->app    = JFactory::getApplication();
+		$this->db     = JFactory::getDbo();
 		$this->menu   = $this->app->getMenu();
 		$this->active = $this->menu->getActive();
 		$this->params = $params;
@@ -65,6 +66,16 @@ function getBranches()
 
 			$items[$item->id] = $item;
 
+			// If menu item is a category, add all articles as menu items
+			if ($item->query['view'] === 'category')
+			{
+				$items[$item->id]->children = $this->linkCategoryItems(
+					$this->getCategoryItems($item->query['id']),
+					$item->query['id'],
+					$item->id
+				);
+			}
+
 			unset($items[$key]);
 
 			if ($item->parent_id != 1)
@@ -118,6 +129,52 @@ function getBranches()
 		return $items;
 	}
 
+	/**
+	 * Get all of the published articles in a given category
+	 *
+	 * @param $categoryId
+	 *
+	 * @return mixed
+	 */
+	private function getCategoryItems($categoryId)
+	{
+
+		$query = $this->db->getQuery(true);
+
+		$query
+			->select($this->db->quoteName(array('id', 'alias', 'title')))
+			->from($this->db->quoteName('#__content'))
+			->where($this->db->quoteName('state') . ' = ' . $this->db->quote('1'), ' AND ')
+			->where($this->db->quoteName('catid') . ' = ' . $this->db->quote($categoryId))
+			->order('ordering ASC');
+
+		// Reset the query using our newly populated query object.
+		$this->db->setQuery($query);
+
+		// Load the results as a list of stdClass objects (see later for more options on retrieving data).
+		return $this->db->loadObjectList();
+	}
+
+	/**
+	 * Generate single article item link, based on supplied parameters
+	 *
+	 * @param $items
+	 * @param $catId
+	 * @param $itemId
+	 *
+	 * @return mixed
+	 */
+	private function linkCategoryItems($items, $catId, $itemId)
+	{
+		foreach ($items as $item)
+		{
+			$item->link = 'index.php?option=com_content&view=article&id=' . $item->id . ':' . $item->alias . '&catid=' . $catId . '&Itemid=' . $itemId;
+		}
+
+		return $items;
+
+	}
+
 	/**
 	 * Renders the menu
 	 *
@@ -176,7 +233,8 @@ public function render($item, $containerTag = '<ul>', $containerClass = 'menu',
 				break;
 
 			default:
-				$output = $itemOpenTag . '<a ' . $browserNav . ' href="' . JRoute::_($item->link . '&Itemid=' . $item->id) . '"/>' . $item->title . '</a>';
+				$item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id;
+				$output     = $itemOpenTag . '<a ' . $browserNav . ' href="' . JRoute::_($item->link) . '"/>' . $item->title . '</a>';
 				break;
 		}
 

From ba9bc498658b4f1f1836d096543bfefaa58730e5 Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Mon, 14 Jul 2014 10:03:32 -0400
Subject: [PATCH 02/14] Adds menu item image support

---
 helper.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/helper.php b/helper.php
index c9aeae3..8fca987 100644
--- a/helper.php
+++ b/helper.php
@@ -113,6 +113,12 @@ function getBranches()
 			{
 				unset($item->children);
 			}
+
+			// Add image to item object if one is defined in the menu item's parameters
+			if ($item->params->get('menu_image', ''))
+			{
+				$item->menu_image = htmlspecialchars($item->params->get('menu_image', ''), ENT_COMPAT, 'UTF-8', false);
+			}
 		}
 
 		return $items;
@@ -154,6 +160,14 @@ public function render($item, $containerTag = '<ul>', $containerClass = 'menu',
 				break;
 		endswitch;
 
+		// Render item title with image if it is set
+		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 . '" />';
+		}
+
 		switch ($item->type)
 		{
 			case 'alias':

From 37d57d48b2cf5f6fb44f13703480e9c0d69924bf Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Mon, 14 Jul 2014 10:57:46 -0400
Subject: [PATCH 03/14] Implements Joomla update server

---
 mod_menuwrench.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml
index 983a95f..0bac99f 100644
--- a/mod_menuwrench.xml
+++ b/mod_menuwrench.xml
@@ -21,6 +21,10 @@
 		<language tag="en-GB">language/en-GB/en-GB.mod_menuwrench.ini</language>
 	</languages>
 
+	<updateservers>
+		<server type="extension" name="Menu Wrench Updates">http://betweenbrain.com/updates/menu-wrench.xml</server>
+	</updateservers>
+
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
@@ -29,7 +33,7 @@
 				       multiple="true"
 				       size="25"
 				       label="MOD_MENU_WRENCH_RENDERED_ITEMS_LABEL"
-				       description="MOD_MENU_WRENCH_RENDERED_ITEMS_DESC"/>
+				       description="MOD_MENU_WRENCH_RENDERED_ITEMS_DESC" />
 
 				<field name="renderDepth"
 				       type="list"
@@ -63,13 +67,13 @@
 				       multiple="true"
 				       size="25"
 				       label="MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_LABEL"
-				       description="MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_DESC"/>
+				       description="MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_DESC" />
 
 				<field name="moduleclass_sfx"
 				       type="text"
 				       default=""
 				       label="Module Class Suffix"
-				       description="PARAMMODULECLASSSUFFIX"/>
+				       description="PARAMMODULECLASSSUFFIX" />
 			</fieldset>
 
 		</fields>

From 9316d64fd945ee5b75e4d0be9c805a88b5ba92ee Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Mon, 14 Jul 2014 14:19:42 -0400
Subject: [PATCH 04/14] Resolves Undefined index notice

---
 helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helper.php b/helper.php
index 175fd2e..50f8371 100644
--- a/helper.php
+++ b/helper.php
@@ -67,7 +67,7 @@ function getBranches()
 			$items[$item->id] = $item;
 
 			// If menu item is a category, add all articles as menu items
-			if ($item->query['view'] === 'category')
+			if (array_key_exists('view', $item->query) && $item->query['view'] === 'category')
 			{
 				$items[$item->id]->children = $this->linkCategoryItems(
 					$this->getCategoryItems($item->query['id']),

From 9c01450117a81a85d7b83e17606c1628a8865bda Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Mon, 14 Jul 2014 14:36:06 -0400
Subject: [PATCH 05/14] Resolve undefined notices for category items

---
 helper.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helper.php b/helper.php
index 50f8371..04b52eb 100644
--- a/helper.php
+++ b/helper.php
@@ -191,6 +191,10 @@ private function linkCategoryItems($items, $catId, $itemId)
 
 	public function render($item, $containerTag = '<ul>', $containerClass = 'menu', $itemTag = '<li>', $level = 0)
 	{
+		// Force object property creation as they don't exist for category blog items
+		$item->browserNav = isset($item->browserNav) ? $item->browserNav : '';
+		$item->class      = isset($item->class) ? $item->class : '';
+		$item->type       = isset($item->type) ? $item->type : '';
 
 		$itemOpenTag       = str_replace('>', ' class="' . $item->class . '">', $itemTag);
 		$itemCloseTag      = str_replace('<', '</', $itemTag);

From 0607f60c661e2dea9cf60eef863ec811837ca8b7 Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Tue, 15 Jul 2014 10:26:28 -0400
Subject: [PATCH 06/14] Adds parameter and corresponding language files

---
 helper.php                              | 3 ++-
 language/en-GB/en-GB.mod_menuwrench.ini | 2 ++
 mod_menuwrench.xml                      | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/helper.php b/helper.php
index 04b52eb..482c526 100644
--- a/helper.php
+++ b/helper.php
@@ -41,6 +41,7 @@ public function __construct($params)
 	function getBranches()
 	{
 		$renderedItems = $this->params->get('renderedItems', 0);
+		$showCategoryItems = $this->params->get('showCategoryItems', 0);
 		$showSubmenu   = $this->params->get('showSubmenu', 1);
 		$hideSubmenu   = $this->params->get('hideSubmenu', 0);
 		// http://stackoverflow.com/questions/3787669/how-to-get-specific-menu-items-from-joomla/10218419#10218419
@@ -67,7 +68,7 @@ function getBranches()
 			$items[$item->id] = $item;
 
 			// If menu item is a category, add all articles as menu items
-			if (array_key_exists('view', $item->query) && $item->query['view'] === 'category')
+			if ($showCategoryItems && array_key_exists('view', $item->query) && $item->query['view'] === 'category')
 			{
 				$items[$item->id]->children = $this->linkCategoryItems(
 					$this->getCategoryItems($item->query['id']),
diff --git a/language/en-GB/en-GB.mod_menuwrench.ini b/language/en-GB/en-GB.mod_menuwrench.ini
index 67f530d..7045f21 100644
--- a/language/en-GB/en-GB.mod_menuwrench.ini
+++ b/language/en-GB/en-GB.mod_menuwrench.ini
@@ -1,4 +1,6 @@
 MOD_MENU_WRENCH_DESC="<a href="_QQ_"http://betweenbrain.com/"_QQ_" target="_QQ_"_blank"_QQ_"><img src="_QQ_"http://betweenbrain.com/images/logo.png"_QQ_" /></a><p class="_QQ_"clear"_QQ_">Throw a wrench at your Joomla menus! This module allows you to render selected menu items from any number of Joomla menus, at any depth in the menu tree, and render them as one menu.</p>"
+MOD_MENU_WRENCH_SHOW_CATEGORY_ITEMS_DESC="Yes to render items belonging to a category blog or list as sub-menu items of that category menu item."
+MOD_MENU_WRENCH_SHOW_CATEGORY_ITEMS_LABEL="Show Category Items"
 MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_DESC="Menu item, or items, to NEVER render the menu branch of."
 MOD_MENU_WRENCH_HIDE_SUBMENU_ITEMS_LABEL="Hide Sub-menu Items"
 MOD_MENU_WRENCH_RENDER_DEPTH_DESC="The levels of depth to render sub-menu items of. Enter 0 to render none."
diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml
index 983a95f..ce629f1 100644
--- a/mod_menuwrench.xml
+++ b/mod_menuwrench.xml
@@ -58,6 +58,15 @@
 					<option value="1">JYES</option>
 				</field>
 
+				<field name="showCategoryItems"
+				       type="radio"
+				       default="0"
+				       label="MOD_MENU_WRENCH_SHOW_CATEGORY_ITEMS_LABEL"
+				       description="MOD_MENU_WRENCH_SHOW_CATEGORY_ITEMS_DESC">
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
 				<field name="hideSubmenu"
 				       type="menuitem"
 				       multiple="true"

From b4fa911541ac7f8af320ecb54cc37bdef7e4535f Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Tue, 15 Jul 2014 11:06:54 -0400
Subject: [PATCH 07/14] Resolve menu_image errors for category items

---
 helper.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/helper.php b/helper.php
index e25d8b4..98cacce 100644
--- a/helper.php
+++ b/helper.php
@@ -40,10 +40,10 @@ public function __construct($params)
 	 */
 	function getBranches()
 	{
-		$renderedItems = $this->params->get('renderedItems', 0);
+		$renderedItems     = $this->params->get('renderedItems', 0);
 		$showCategoryItems = $this->params->get('showCategoryItems', 0);
-		$showSubmenu   = $this->params->get('showSubmenu', 1);
-		$hideSubmenu   = $this->params->get('hideSubmenu', 0);
+		$showSubmenu       = $this->params->get('showSubmenu', 1);
+		$hideSubmenu       = $this->params->get('hideSubmenu', 0);
 		// http://stackoverflow.com/questions/3787669/how-to-get-specific-menu-items-from-joomla/10218419#10218419
 		$items = $this->menu->getItems(null, null);
 
@@ -201,6 +201,7 @@ public function render($item, $containerTag = '<ul>', $containerClass = 'menu',
 		// Force object property creation as they don't exist for category blog items
 		$item->browserNav = isset($item->browserNav) ? $item->browserNav : '';
 		$item->class      = isset($item->class) ? $item->class : '';
+		$item->menu_image = isset($item->menu_image) ? $item->menu_image : '';
 		$item->type       = isset($item->type) ? $item->type : '';
 
 		$itemOpenTag       = str_replace('>', ' class="' . $item->class . '">', $itemTag);

From 9deb8602f5e4ecc43c9aa07e054bb37a32890379 Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Tue, 15 Jul 2014 11:07:05 -0400
Subject: [PATCH 08/14] Version bump

---
 mod_menuwrench.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml
index fd92ac1..a6a929f 100644
--- a/mod_menuwrench.xml
+++ b/mod_menuwrench.xml
@@ -3,12 +3,12 @@
            version="2.5"
            method="upgrade">
 	<name>Menu Wrench</name>
-	<creationDate>May 20, 2014</creationDate>
+	<creationDate>July 15, 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.0.0</version>
+	<version>1.0.1</version>
 	<description>MOD_MENU_WRENCH_DESC</description>
 
 	<files>

From 8c13bbc9af3ba592b2e200b808c3a54abf71689b Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Fri, 18 Jul 2014 07:37:51 -0400
Subject: [PATCH 09/14] Adds method to check if item is com_content category
 before rendering it's category items

---
 helper.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/helper.php b/helper.php
index 98cacce..0c425d8 100644
--- a/helper.php
+++ b/helper.php
@@ -68,7 +68,7 @@ function getBranches()
 			$items[$item->id] = $item;
 
 			// If menu item is a category, add all articles as menu items
-			if ($showCategoryItems && array_key_exists('view', $item->query) && $item->query['view'] === 'category')
+			if ($showCategoryItems && $this->isContent($item))
 			{
 				$items[$item->id]->children = $this->linkCategoryItems(
 					$this->getCategoryItems($item->query['id']),
@@ -162,6 +162,23 @@ private function getCategoryItems($categoryId)
 		return $this->db->loadObjectList();
 	}
 
+	/**
+	 * Check if a menu item is com_content and a category type
+	 *
+	 * @param $item
+	 *
+	 * @return bool
+	 */
+	private function isContent($item)
+	{
+		if (array_key_exists('view', $item->query) && $item->query['option'] === 'com_content' && $item->query['view'] === 'category')
+		{
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Generate single article item link, based on supplied parameters
 	 *

From a7d25c27779440958337c0f67dfcae3e54168352 Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Fri, 18 Jul 2014 08:27:40 -0400
Subject: [PATCH 10/14] Abstracting code into individual methods

---
 helper.php | 129 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 92 insertions(+), 37 deletions(-)

diff --git a/helper.php b/helper.php
index 0c425d8..4dc36ee 100644
--- a/helper.php
+++ b/helper.php
@@ -159,7 +159,7 @@ private function getCategoryItems($categoryId)
 		$this->db->setQuery($query);
 
 		// Load the results as a list of stdClass objects (see later for more options on retrieving data).
-		return $this->db->loadObjectList();
+		return $this->setNullProperties($this->db->loadObjectList());
 	}
 
 	/**
@@ -215,39 +215,49 @@ private function linkCategoryItems($items, $catId, $itemId)
 
 	public function render($item, $containerTag = '<ul>', $containerClass = 'menu', $itemTag = '<li>', $level = 0)
 	{
-		// Force object property creation as they don't exist for category blog items
-		$item->browserNav = isset($item->browserNav) ? $item->browserNav : '';
-		$item->class      = isset($item->class) ? $item->class : '';
-		$item->menu_image = isset($item->menu_image) ? $item->menu_image : '';
-		$item->type       = isset($item->type) ? $item->type : '';
-
 		$itemOpenTag       = str_replace('>', ' class="' . $item->class . '">', $itemTag);
 		$itemCloseTag      = str_replace('<', '</', $itemTag);
 		$containerOpenTag  = str_replace('>', ' class="' . $containerClass . '">', $containerTag);
 		$containerCloseTag = str_replace('<', '</', $containerTag);
 		$renderDepth       = htmlspecialchars($this->params->get('renderDepth', 10));
 
-		switch ($item->browserNav) :
-			default:
-			case 0:
-				$browserNav = '';
-				break;
-			case 1:
-				$browserNav = 'target="_blank"';
-				break;
-			case 2:
-				$browserNav = "onclick=\"window.open(this.href,'targetWindow','toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,'" . $this->params->get('window_open') . ");return false;\"";
-				break;
-		endswitch;
+		$output = $this->startOutput($item, $itemOpenTag);
 
-		// Render item title with image if it is set
-		if ($item->menu_image)
+		$level++;
+
+		if (isset($item->children) && $level <= $renderDepth)
 		{
-			$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 . '" />';
+
+			$output .= $containerOpenTag;
+
+			foreach ($item->children as $item)
+			{
+
+				$output .= $this->render($item, $containerTag, $containerClass, $itemTag, $level);
+			}
+			$output .= $itemCloseTag;
+			$output .= $containerCloseTag;
 		}
 
+		$output .= $itemCloseTag;
+
+		return $output;
+	}
+
+	/**
+	 * Starts rendering of the item output
+	 *
+	 * @param $item
+	 * @param $itemOpenTag
+	 *
+	 * @return string
+	 */
+	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;
+
 		switch ($item->type)
 		{
 			case 'alias':
@@ -275,24 +285,69 @@ public function render($item, $containerTag = '<ul>', $containerClass = 'menu',
 				break;
 		}
 
-		$level++;
-
-		if (isset($item->children) && $level <= $renderDepth)
-		{
+		return $output;
+	}
 
-			$output .= $containerOpenTag;
+	/**
+	 * Conditionally sets the item's browsernav property
+	 *
+	 * @param $item
+	 *
+	 * @return string
+	 */
+	private function setBrowsernav($item)
+	{
+		switch ($item->browserNav) :
+			default:
+			case 0:
+				$browserNav = '';
+				break;
+			case 1:
+				$browserNav = 'target="_blank"';
+				break;
+			case 2:
+				$browserNav = "onclick=\"window.open(this.href,'targetWindow','toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,'" . $this->params->get('window_open') . ");return false;\"";
+				break;
+		endswitch;
 
-			foreach ($item->children as $item)
-			{
+		return $browserNav;
+	}
 
-				$output .= $this->render($item, $containerTag, $containerClass, $itemTag, $level);
-			}
-			$output .= $itemCloseTag;
-			$output .= $containerCloseTag;
+	/**
+	 * Sets null properties if they don't exist
+	 *
+	 * @param $items
+	 *
+	 * @return mixed
+	 */
+	private function setNullProperties($items)
+	{
+		foreach ($items as $item)
+		{
+			$item->class = property_exists($item, 'class') ? $this->class : '';
+			$item->type  = property_exists($item, 'type') ? $this->type : '';
 		}
 
-		$output .= $itemCloseTag;
+		return $items;
+	}
 
-		return $output;
+	/**
+	 * Render item title with image if it is set
+	 *
+	 * @param $item
+	 *
+	 * @return string
+	 */
+	private function setTitle($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->title;
 	}
+
 }

From 8154a94758c54d5352903b4d7802a9802e2bb4a5 Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Tue, 22 Jul 2014 10:38:35 -0400
Subject: [PATCH 11/14] This should be 1.1.0 according to SemVer

---
 mod_menuwrench.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml
index a6a929f..9327f38 100644
--- a/mod_menuwrench.xml
+++ b/mod_menuwrench.xml
@@ -8,7 +8,7 @@
 	<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.0.1</version>
+	<version>1.1.0</version>
 	<description>MOD_MENU_WRENCH_DESC</description>
 
 	<files>

From fe2fb9a4da0b98c5330740eb40a8dc2f3ff3ed4e Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Tue, 22 Jul 2014 12:59:17 -0400
Subject: [PATCH 12/14] Abstract class generation into own method

---
 helper.php | 56 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/helper.php b/helper.php
index 4dc36ee..e00966f 100644
--- a/helper.php
+++ b/helper.php
@@ -97,29 +97,6 @@ function getBranches()
 				unset($items[$key]);
 			}
 
-			/**
-			 * Builds object classes
-			 */
-			$item->class = 'item' . $item->id . ' ' . $item->alias;
-
-			// Add parent class to all parents
-			if (isset($item->children))
-			{
-				$item->class .= ' parent';
-			}
-
-			// Add current class to specific item
-			if ($item->id == $this->active->id)
-			{
-				$item->class .= ' current';
-			}
-
-			// Add active class to all items in active branch
-			if (in_array($item->id, $this->active->tree))
-			{
-				$item->class .= ' active';
-			}
-
 			// Hide sub-menu items if parameter set to no and parent not active
 			if ((!in_array($item->id, $this->active->tree) && $showSubmenu == 0) || in_array($item->id, $hideSubmenu))
 			{
@@ -162,6 +139,34 @@ private function getCategoryItems($categoryId)
 		return $this->setNullProperties($this->db->loadObjectList());
 	}
 
+	private function getClasses($item)
+	{
+		/**
+		 * Builds object classes
+		 */
+		$classes = 'item' . $item->id . ' ' . $item->alias;
+
+		// Add parent class to all parents
+		if (isset($item->children))
+		{
+			$classes .= ' parent';
+		}
+
+		// Add current class to specific item
+		if ($item->id == $this->active->id)
+		{
+			$classes .= ' current';
+		}
+
+		// Add active class to all items in active branch
+		if (in_array($item->id, $this->active->tree))
+		{
+			$classes .= ' active';
+		}
+
+		return $classes;
+	}
+
 	/**
 	 * Check if a menu item is com_content and a category type
 	 *
@@ -215,7 +220,7 @@ private function linkCategoryItems($items, $catId, $itemId)
 
 	public function render($item, $containerTag = '<ul>', $containerClass = 'menu', $itemTag = '<li>', $level = 0)
 	{
-		$itemOpenTag       = str_replace('>', ' class="' . $item->class . '">', $itemTag);
+		$itemOpenTag       = str_replace('>', ' class="' . $this->getClasses($item) . '">', $itemTag);
 		$itemCloseTag      = str_replace('<', '</', $itemTag);
 		$containerOpenTag  = str_replace('>', ' class="' . $containerClass . '">', $containerTag);
 		$containerCloseTag = str_replace('<', '</', $containerTag);
@@ -324,8 +329,7 @@ private function setNullProperties($items)
 	{
 		foreach ($items as $item)
 		{
-			$item->class = property_exists($item, 'class') ? $this->class : '';
-			$item->type  = property_exists($item, 'type') ? $this->type : '';
+			$item->type = property_exists($item, 'type') ? $this->type : '';
 		}
 
 		return $items;

From 146153058cc8632177e3ff9a3be04dfb5e96878c Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Thu, 24 Jul 2014 16:18:06 -0400
Subject: [PATCH 13/14] Resolves issue #15 by implementing method to determine
 if an item is active, taking into consideration the issues associated with
 category items dynamically being rendered as menu items

---
 helper.php | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/helper.php b/helper.php
index e00966f..e7f5b0b 100644
--- a/helper.php
+++ b/helper.php
@@ -153,7 +153,7 @@ private function getClasses($item)
 		}
 
 		// Add current class to specific item
-		if ($item->id == $this->active->id)
+		if ($this->isActive($item))
 		{
 			$classes .= ' current';
 		}
@@ -167,6 +167,62 @@ private function getClasses($item)
 		return $classes;
 	}
 
+	/**
+	 * Checks if the current item is active. Category items that are dynamically
+	 * rendered as menu items will have the same Itemid and thus falsely match active->id
+	 *
+	 * @param $item
+	 *
+	 * @return bool
+	 */
+	private function isActive($item)
+	{
+		if ($item->id == $this->active->id && !$this->isActiveChild($item))
+		{
+			return true;
+		}
+		elseif ($this->isActiveArticle($item))
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Checks if the current item has any active children
+	 *
+	 * @param $item
+	 *
+	 * @return bool
+	 */
+	private function isActiveChild($item)
+	{
+		if (property_exists($item, 'children'))
+		{
+			foreach ($item->children as $child)
+			{
+				if ($this->isActiveArticle($child))
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Checks if the item is an article and active
+	 *
+	 * @param $item
+	 *
+	 * @return bool
+	 */
+	private function isActiveArticle($item)
+	{
+		if ($this->app->input->get('view') == 'article' && $item->id == $this->app->input->get('id', '', 'INT'))
+		{
+			return true;
+		}
+	}
+
 	/**
 	 * Check if a menu item is com_content and a category type
 	 *

From 8c3804b0d9f050f24eaab9a5c72da23c93393ed0 Mon Sep 17 00:00:00 2001
From: Matt Thomas <matt@betweenbrain.com>
Date: Thu, 24 Jul 2014 16:35:44 -0400
Subject: [PATCH 14/14] Update create date

---
 mod_menuwrench.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml
index 9327f38..17873db 100644
--- a/mod_menuwrench.xml
+++ b/mod_menuwrench.xml
@@ -3,7 +3,7 @@
            version="2.5"
            method="upgrade">
 	<name>Menu Wrench</name>
-	<creationDate>July 15, 2014</creationDate>
+	<creationDate>July 24, 2014</creationDate>
 	<author>Matt Thomas</author>
 	<authorUrl>http://betweenbrain.com</authorUrl>
 	<copyright>Copyright (C) 2013-2014 betweenbrain llc. All rights reserved.</copyright>