From 72f864ff50d01b8bc18904db7a6ba4fa32c44783 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <foellmann@foe-services.de>
Date: Wed, 7 Jan 2015 20:30:46 +0100
Subject: UPDATE 4.3.6

---
 libraries/Menu.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libraries/Menu.class.php')

diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index a9f2b15afb..a4b537e8ab 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -507,13 +507,13 @@ class PMA_Menu
      */
     private function _getServerTabs()
     {
-        $is_superuser = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser();
+        $is_superuser = $GLOBALS['dbi']->isSuperuser();
         $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
             || $GLOBALS['dbi']->isUserType('create');
         $binary_logs = null;
         $notDrizzle = ! defined('PMA_DRIZZLE')
             || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE);
-        if (isset($GLOBALS['dbi']) && $notDrizzle) {
+        if ($notDrizzle) {
             if (PMA_Util::cacheExists('binary_logs')) {
                 $binary_logs = PMA_Util::cacheGet('binary_logs');
             } else {
-- 
cgit v1.2.3