From fe3a103767bd5f68a89d2527c29ad1f2bcffc54a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 14 Apr 2015 09:57:52 +0530
Subject: [PATCH] bug #4851 PHP errors in login dialogue

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                | 1 +
 libraries/common.inc.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 95961f15d8..f3236d5453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.4.3.0 (not yet released)
+- bug #4851 PHP errors in login dialogue
 
 4.4.2.0 (2015-04-13)
 - bug #4835 PMA_hideShowConnection not called after submit_num_fields
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index ac243980fd..a4d15e265a 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -1177,6 +1177,7 @@ if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {
 
 // If Zero configuration mode enabled, check PMA tables in current db.
 if (! defined('PMA_MINIMUM_COMMON')
+    && ! empty($GLOBALS['server'])
     && isset($GLOBALS['cfg']['ZeroConf'])
     && $GLOBALS['cfg']['ZeroConf'] == true
 ) {