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] 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"