From 908280e10bde7f8746567975d8c36ceed86db0a8 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Mon, 4 Aug 2014 13:27:53 -0400 Subject: [PATCH 1/9] Rename setTitle as setImage Use ternary return for setImage Set item->inner property to avoid manipulating title recursively --- helper.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/helper.php b/helper.php index 0d26c1b..e75bcb1 100644 --- a/helper.php +++ b/helper.php @@ -317,32 +317,32 @@ 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; + $item->inner = property_exists($item, 'menu_image') ? $this->setImage($item) : $item->title; switch ($item->type) { case 'alias': - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->inner . ''; break; case 'separator': - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->inner . ''; break; case 'url' : if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false)) { - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->inner . ''; } else { - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->inner . ''; } break; default: $item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->inner . ''; 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 = '' . $item->title . '' . $item->title . ' ' : - $item->title = '' . $item->title . ''; + return $item->params->get('menu_text', 1) ? + '' . $item->title . '' . $item->title . ' ' : + '' . $item->title . ''; } - - return $item->title; } } From f8f431a016b0fad13b3d607e10d4fa651809f829 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Mon, 4 Aug 2014 23:49:57 -0400 Subject: [PATCH 2/9] Revert "Rename setTitle as setImage" This reverts commit 908280e10bde7f8746567975d8c36ceed86db0a8. --- helper.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/helper.php b/helper.php index e75bcb1..0d26c1b 100644 --- a/helper.php +++ b/helper.php @@ -317,32 +317,32 @@ private function startOutput($item, $itemOpenTag) { $browserNav = property_exists($item, 'browserNav') ? $this->setBrowsernav($item) : ''; - $item->inner = property_exists($item, 'menu_image') ? $this->setImage($item) : $item->title; + $item->title = property_exists($item, 'menu_image') ? $this->setTitle($item) : $item->title; switch ($item->type) { case 'alias': - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $item->title . ''; break; case 'separator': - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $item->title . ''; break; case 'url' : if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false)) { - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $item->title . ''; } else { - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $item->title . ''; } break; default: $item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $item->title . ''; break; } @@ -398,14 +398,16 @@ private function setNullProperties($items) * * @return string */ - private function setImage($item) + private function setTitle($item) { if ($item->menu_image) { - return $item->params->get('menu_text', 1) ? - '' . $item->title . '' . $item->title . ' ' : - '' . $item->title . ''; + $item->params->get('menu_text', 1) ? + $item->title = '' . $item->title . '' . $item->title . ' ' : + $item->title = '' . $item->title . ''; } + + return $item->title; } } From 64fb0a9d26e9ca9e91baeb056a574d63f4ef0ed5 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Mon, 4 Aug 2014 23:59:33 -0400 Subject: [PATCH 3/9] Not modify item object but instead use disposable variable $title --- helper.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/helper.php b/helper.php index e75bcb1..26af495 100644 --- a/helper.php +++ b/helper.php @@ -316,33 +316,33 @@ public function render($item, $containerTag = '
    ', $containerClass = 'menu', private function startOutput($item, $itemOpenTag) { - $browserNav = property_exists($item, 'browserNav') ? $this->setBrowsernav($item) : ''; - $item->inner = property_exists($item, 'menu_image') ? $this->setImage($item) : $item->title; + $browserNav = property_exists($item, 'browserNav') ? $this->setBrowsernav($item) : ''; + $title = property_exists($item, 'menu_image') ? $this->setImage($item) : $item->title; switch ($item->type) { case 'alias': - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $title . ''; break; case 'separator': - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $title . ''; break; case 'url' : if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false)) { - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $title . ''; } else { - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $title . ''; } break; default: $item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; - $output = $itemOpenTag . '' . $item->inner . ''; + $output = $itemOpenTag . '' . $title . ''; break; } From fdd7eeb6362a666d01c1211d20ba4e5d1d3253c1 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Tue, 5 Aug 2014 00:00:10 -0400 Subject: [PATCH 4/9] Don't modify item object but instead use disposable variable $link --- helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helper.php b/helper.php index 26af495..e8510b3 100644 --- a/helper.php +++ b/helper.php @@ -341,8 +341,8 @@ private function startOutput($item, $itemOpenTag) break; default: - $item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; - $output = $itemOpenTag . '' . $title . ''; + $link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; + $output = $itemOpenTag . '' . $title . ''; break; } From c156b5907c0b46e2c47c1c9e09d778649f0666e3 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Tue, 5 Aug 2014 00:02:57 -0400 Subject: [PATCH 5/9] If menu wrench is not the first menu module to render an item, the menu_image property may be set, but blank. --- helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper.php b/helper.php index e8510b3..d984c71 100644 --- a/helper.php +++ b/helper.php @@ -317,7 +317,7 @@ private function startOutput($item, $itemOpenTag) { $browserNav = property_exists($item, 'browserNav') ? $this->setBrowsernav($item) : ''; - $title = property_exists($item, 'menu_image') ? $this->setImage($item) : $item->title; + $title = property_exists($item, 'menu_image') && $item->menu_image != '' ? $this->setImage($item) : $item->title; switch ($item->type) { From 0974ec939c0aa8a34868f4daaa618b94f4553294 Mon Sep 17 00:00:00 2001 From: Elvis Sedic Date: Wed, 17 Sep 2014 13:46:39 +0200 Subject: [PATCH 6/9] Fix for HTML validation errors on closing tags Resolves html validation errors: "Self-closing syntax (/>) used on a non-void HTML element". Links were rendered as Some link --- helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helper.php b/helper.php index 0d26c1b..6a7f33e 100644 --- a/helper.php +++ b/helper.php @@ -322,7 +322,7 @@ private function startOutput($item, $itemOpenTag) switch ($item->type) { case 'alias': - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->title . ''; break; case 'separator': @@ -332,17 +332,17 @@ private function startOutput($item, $itemOpenTag) case 'url' : if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false)) { - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->title . ''; } else { - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->title . ''; } break; default: $item->link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; - $output = $itemOpenTag . '' . $item->title . ''; + $output = $itemOpenTag . '' . $item->title . ''; break; } From d2a274970ad9299efe57c7c862f64667b2791fa5 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Wed, 17 Sep 2014 13:08:12 -0400 Subject: [PATCH 7/9] Merge branch 'esedic-master' into develop Closes #21 --- helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helper.php b/helper.php index d984c71..faa8504 100644 --- a/helper.php +++ b/helper.php @@ -322,7 +322,7 @@ private function startOutput($item, $itemOpenTag) switch ($item->type) { case 'alias': - $output = $itemOpenTag . '' . $title . ''; + $output = $itemOpenTag . '' . $title . ''; break; case 'separator': @@ -332,17 +332,17 @@ private function startOutput($item, $itemOpenTag) case 'url' : if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false)) { - $output = $itemOpenTag . '' . $title . ''; + $output = $itemOpenTag . '' . $title . ''; } else { - $output = $itemOpenTag . '' . $title . ''; + $output = $itemOpenTag . '' . $title . ''; } break; default: $link = strpos($item->link, 'Itemid') ? $item->link : $item->link . '&Itemid=' . $item->id; - $output = $itemOpenTag . '' . $title . ''; + $output = $itemOpenTag . '' . $title . ''; break; } From 329a839f400dfa6ebc45c0f2f881bc568e569347 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Fri, 19 Sep 2014 13:30:19 -0400 Subject: [PATCH 8/9] Closes issue #22 by implementing module class suffix --- tmpl/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpl/default.php b/tmpl/default.php index 8e74477..abf9baa 100644 --- a/tmpl/default.php +++ b/tmpl/default.php @@ -9,7 +9,7 @@ * License GNU GPL v2 or later */ ?> -
      +
        render($item, '
          ', 'menu', '
        • '); } From 89d3e4a6ac013bdf8827e73dcad4b569ef965474 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Fri, 19 Sep 2014 13:33:53 -0400 Subject: [PATCH 9/9] Version update --- mod_menuwrench.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod_menuwrench.xml b/mod_menuwrench.xml index 576542c..1acd880 100644 --- a/mod_menuwrench.xml +++ b/mod_menuwrench.xml @@ -3,12 +3,12 @@ version="2.5" method="upgrade"> Menu Wrench - July 28, 2014 + September 19, 2014 Matt Thomas http://betweenbrain.com Copyright (C) 2013-2014 betweenbrain llc. All rights reserved. GNU General Public License version 2, or later. - 1.1.1 + 1.1.2 MOD_MENU_WRENCH_DESC