From f727660ed9da0c3c43295719e26a52d7a1f71a08 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 14 Jan 2019 17:40:12 -0800
Subject: [PATCH] Fix for missing buttons in Admin Panel.

---
 e107_admin/includes/flexpanel.php |  3 ++-
 e107_admin/includes/infopanel.php | 30 +++++-------------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/e107_admin/includes/flexpanel.php b/e107_admin/includes/flexpanel.php
index 1f9182b61..2540d3118 100644
--- a/e107_admin/includes/flexpanel.php
+++ b/e107_admin/includes/flexpanel.php
@@ -198,12 +198,13 @@ class adminstyle_flexpanel extends adminstyle_infopanel
 		$mainPanel .= "<div class='left'>";
 		foreach($this->iconlist as $key => $val)
 		{
-			if(!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107']))
+			if(empty($myE107) || in_array($key, $user_pref['core-infopanel-mye107']))
 			{
 				$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
 			}
 		}
 		$mainPanel .= "</div></div>";
+
 		// Rendering the saved configuration.
 		$ns->setStyle('flexpanel');
 		$caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME));
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 085e2e0e3..87d0aa1a4 100755
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -261,34 +261,12 @@ class adminstyle_infopanel
 		$mainPanel = "
 		<div id='core-infopanel_mye107' >
 		";
-		
-		/*
-		$mainPanel .= '<span class="pull-right">
-		          <span class="options">
-		            <div class="btn-group">
-		              <a class="dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i></a>
-		              <ul class="dropdown-menu black-box-dropdown dropdown-right">
-		                <li>'.$this->render_infopanel_icons().'</li>
-		              </ul>
-		            </div>
-		          </span>
-		        </span>';
-		
-		*/
-		
-	//	print_a($user_pref['core-infopanel-mye107']);
-        
-		$mainPanel .= "
-		
-		
-		
-		
-			
-				<div class='left'>";
+
+		$mainPanel .= "<div class='left'>";
 			
 			foreach ($this->iconlist as $key=>$val)
 			{
-				if (!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107']))
+				if (empty($myE107) || in_array($key, $user_pref['core-infopanel-mye107']))
 				{
 					$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
 				}
@@ -299,6 +277,8 @@ class adminstyle_infopanel
 	      
 			</div>";
 
+		e107::getDebug()->log($this->iconlist);
+
 		$caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME));
 
 		$text3 = $this->renderAddonDashboards();