diff --git a/e107_files/shortcode/batch/admin_shortcodes_class.php b/e107_files/shortcode/batch/admin_shortcodes_class.php
index 468c5ed98..9cd6a5c29 100644
--- a/e107_files/shortcode/batch/admin_shortcodes_class.php
+++ b/e107_files/shortcode/batch/admin_shortcodes_class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: admin_shortcodes_class.php,v 1.24 2009-09-22 15:37:46 e107coders Exp $
+* $Id: admin_shortcodes_class.php,v 1.25 2009-09-25 22:45:28 e107coders Exp $
 *
 * Admin shortcode batch - class
 */
@@ -1151,7 +1151,7 @@ class admin_shortcodes
 				$tmp['sub_class'] = '';
 				$tmp['sort'] = false;
 
-				if($pref['admin_slidedown_subs'] && varsettrue($array_sub_functions[$key]))
+				if($pref['admin_slidedown_subs'] && vartrue($array_sub_functions[$key]))
 				{
 					$tmp['sub_class'] = 'sub';
 					foreach ($array_sub_functions[$key] as $subkey => $subsubitem)
@@ -1182,18 +1182,17 @@ class admin_shortcodes
 			{
 				if($plug->parse_plugin($row['plugin_path']))
 				{
-
-
 					$plug_vars = $plug->plug_vars;
 					e107::loadLanFiles($row['plugin_path'], 'admin');
-					if(varset($plug_vars['administration']['configFile']))
-					{
+					if(varset($plug_vars['adminLinks']['link']))
+					{		
+						
 						$plugpath = varset($plug_vars['plugin_php']) ? e_PLUGIN_ABS : e_PLUGIN_ABS.$row['plugin_path'].'/';
 						$icon_src = varset($plug_vars['administration']['iconSmall']) ? $plugpath.$plug_vars['administration']['iconSmall'] : '';
 						$icon_src_lrg = varset($plug_vars['administration']['icon']) ? $plugpath.$plug_vars['administration']['iconSmall'] : '';
 						$id = 'plugnav-'.$row['plugin_path'];
 					
-           	  			$tmp[$id]['text'] = $e107->tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs");
+           	  			$tmp[$id]['text'] = e107::getParser()->toHTML($plug_vars['@attributes']['name'], FALSE, "LINKTEXT");
 						$tmp[$id]['description'] = $plug_vars['description'];
 						$tmp[$id]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plug_vars['administration']['configFile'];
 					 	$tmp[$id]['image'] = $icon_src ? "<img src='{$icon_src}' alt=\"".varset($tmp[$id]['text'])."\" class='icon S16' />" : E_16_PLUGIN;
@@ -1205,20 +1204,28 @@ class admin_shortcodes
 						$tmp[$id]['sort'] = 2;
 						$tmp[$id]['category'] = $row['plugin_category'];
 
-						if($pref['admin_slidedown_subs'] && varsettrue($plug_vars['administration']['subMenuItem']))
+						if($pref['admin_slidedown_subs'] && vartrue($plug_vars['adminLinks']['link']))
 						{
 							$tmp[$id]['sub_class'] = 'sub';
 							$tmp[$id]['sort'] = false;
-							foreach ($plug_vars['administration']['subMenuItem'] as $subkey => $plugsub)
+							foreach ($plug_vars['adminLinks']['link'] as $subkey => $plugsub)
 							{
 								$subid = $id.'-'.$subkey;
 								$predef_icons = array('add', 'manage', 'settings');
+								$title = $plugsub['@value'];
 								$plugsub = $plugsub['@attributes'];
+								
+								if(varset($plugsub['primary'])=='true') // remove primary links. 
+								{
+									continue;
+								}
+								
 								$icon_src = in_array($plugsub['icon'], $predef_icons) ? e_IMAGE_ABS."admin_images/{$plugsub['icon']}_16.png" : ( $plugsub['icon'] ? $plugpath.$plugsub['icon'] : '');
 
-								$tmp[$id]['sub'][$subid]['text'] = $e107->tp->toHTML($plugsub['title'], FALSE, "defs");
-								$tmp[$id]['sub'][$subid]['description'] = $plug_vars['description'];
-								$tmp[$id]['sub'][$subid]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plugsub['link'];
+
+								$tmp[$id]['sub'][$subid]['text'] = e107::getParser()->toHTML($title, FALSE, 'LINKTEXT');
+								$tmp[$id]['sub'][$subid]['description'] = e107::getParser()->toHTML($plug_vars['description']);
+								$tmp[$id]['sub'][$subid]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plugsub['url'];
 								$tmp[$id]['sub'][$subid]['image'] = $icon_src ? "<img src='{$icon_src}' alt=\"".varset($tmp[$id]['sub'][$subid]['text'])."\" class='icon S16' />" : "";
 								$tmp[$id]['sub'][$subid]['image_large'] = '';
 								$tmp[$id]['sub'][$subid]['image_src'] = $icon_src;