From 0610dad19a7b2e9321197177c2f2af34915c7c63 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 29 Jan 2021 11:03:04 -0800
Subject: [PATCH] Fix for missing menus on some admin pages.

---
 e107_handlers/admin_ui.php        | 2 +-
 e107_handlers/sitelinks_class.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index f2865be03..de94baf8f 100755
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -1683,7 +1683,7 @@ class e_admin_dispatcher
 
 		$toggle = "<span class='e-toggle-sidebar'><!-- --></span>";
 
-		$var['_extras_'] = array('icon'=> $icon);
+		$var['_extras_'] = array('icon'=> $icon, 'return'=>true);
 
 	//	$var['_icon_'] = $icon;
 
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index 45122a679..54e153d01 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1418,7 +1418,12 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 		$ret = $ns->tablerender($title, $text, 'default', true);
 		$ns->setUniqueId(null);
 
-		return $ret;
+		if(!empty($extraParms['return']))
+		{
+			return $ret;
+		}
+
+		echo $ret;
 	}