From 7b7ca47d15e5d1283c718ba127f6f33912a5e7cc Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Mon, 3 Dec 2012 04:52:23 -0800
Subject: [PATCH] Function fixes for e_navigation. (also corrects issue in
 admin_menu.php )

---
 e107_handlers/sitelinks_class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index ef06b6ce9..797b5b198 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -854,7 +854,7 @@ class e_navigation
 				*/
 			ksort($plugin_array, SORT_STRING);  // To FIX, without changing the current key format, sort by 'title'
 		
-			if($linkStyle == "array")
+			if($linkStyle == "array" || $iconSize == 'assoc')
 			{
 		       	return $plugin_array;
 			}
@@ -862,7 +862,7 @@ class e_navigation
 			foreach ($plugin_array as $plug_key => $plug_value)
 			{
 				$the_icon =  ($iconSize == E_16_PLUGMANAGER) ?  $plug_value['icon'] : $plug_value['icon_32'];
-				$text .= render_links($plug_value['link'], $plug_value['title'], $plug_value['caption'], $plug_value['perms'], $the_icon, $linkStyle);
+				$text .= $this->renderAdminButton($plug_value['link'], $plug_value['title'], $plug_value['caption'], $plug_value['perms'], $the_icon, $linkStyle);
 			}
 			return $text;
 	}