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/Config.class.php              |  2 +-
 libraries/Menu.class.php                |  4 ++--
 libraries/RecentFavoriteTable.class.php |  4 ++--
 libraries/common.inc.php                | 11 +++++++++--
 libraries/config/setup.forms.php        |  2 +-
 libraries/language_stats.inc.php        |  2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'libraries')

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 3508138822..de90899621 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.3.5');
+        $this->set('PMA_VERSION', '4.3.6');
         /**
          * @deprecated
          */
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 {
diff --git a/libraries/RecentFavoriteTable.class.php b/libraries/RecentFavoriteTable.class.php
index 2cf934b3ca..8582cef5f6 100644
--- a/libraries/RecentFavoriteTable.class.php
+++ b/libraries/RecentFavoriteTable.class.php
@@ -381,8 +381,8 @@ class PMA_RecentFavoriteTable
     private function _getPmaTable()
     {
         $cfgRelation = PMA_getRelationsParam();
-        if (/*overload*/mb_strlen($cfgRelation['db'])
-            && /*overload*/mb_strlen($cfgRelation[$this->_tableType])
+        if (! empty($cfgRelation['db'])
+            && ! empty($cfgRelation[$this->_tableType])
         ) {
             return PMA_Util::backquote($cfgRelation['db']) . "."
                 . PMA_Util::backquote($cfgRelation[$this->_tableType]);
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index ff55609645..d06b37aea7 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -1042,7 +1042,13 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         }
         $_SESSION['tmpval']['previous_server'] = $GLOBALS['server'];
 
-    } // end server connecting
+    } else { // end server connecting
+        // No need to check for 'PMA_BYPASS_GET_INSTANCE' since this execution path
+        // applies only to initial login
+        $response = PMA_Response::getInstance();
+        $response->getHeader()->disableMenuAndConsole();
+        $response->getFooter()->setMinimal();
+    }
 
     /**
      * check if profiling was requested and remember it
@@ -1148,7 +1154,8 @@ if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
 }
 
 // If Zero configuration mode enabled, check PMA tables in current db.
-if (isset($GLOBALS['cfg']['ZeroConf'])
+if (! defined('PMA_MINIMUM_COMMON')
+    && isset($GLOBALS['cfg']['ZeroConf'])
     && $GLOBALS['cfg']['ZeroConf'] == true
 ) {
     if (! empty($GLOBALS['db'])) {
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 68b409efb7..8c285f8d53 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -75,7 +75,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
     'column_info' => 'pma__column_info',
     'history' => 'pma__history',
     'recent' => 'pma__recent',
-    'favorite' => 'pma_favorite',
+    'favorite' => 'pma__favorite',
     'table_uiprefs' => 'pma__table_uiprefs',
     'tracking' => 'pma__tracking',
     'table_coords' => 'pma__table_coords',
diff --git a/libraries/language_stats.inc.php b/libraries/language_stats.inc.php
index 417d7173ba..430e8bc024 100644
--- a/libraries/language_stats.inc.php
+++ b/libraries/language_stats.inc.php
@@ -61,7 +61,7 @@ $GLOBALS["language_stats"] = array (
     'si' => 67,
     'sk' => 76,
     'sl' => 99,
-    'sq' => 25,
+    'sq' => 100,
     'sr@latin' => 51,
     'sr' => 25,
     'sv' => 91,
-- 
cgit v1.2.3