From e0de22d80633b322bf1983de4442352290e315ff Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 6 Jan 2015 16:49:51 +0530 Subject: [PATCH 1/2] Do not try to auto configure pma tables if PMA_MINIMUM_COMMON is defined Signed-off-by: Madhura Jayaratne --- libraries/common.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index f0076acb15..d06b37aea7 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1154,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'])) { From 88cc79896a54efef3faf54842a3425fc2e6890af Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 7 Jan 2015 09:25:28 -0500 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e2f8be066b..55aa4b578e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4685 Call to a member function isUserType() on a non-object - bug #4691 Do not include console when no server is selected - bug #4688 File permissions in archive +- bug #4692 Dynamic javascripts gives 500 when db selected 4.3.5.0 (2015-01-05) - bug Auto-configuration: tables were not created automatically