From 8f640b90302da6f8b5a635d473b4919a42b1e6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 15 Mar 2017 16:18:05 +0100 Subject: [PATCH] Do not point users to setup when it is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13084 Signed-off-by: Michal Čihař --- ChangeLog | 1 + prefs_manage.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ded071f13a..10d7fb0937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ phpMyAdmin - ChangeLog - issue #13029 Fixed table tracking for nested table groups - issue #13053 Fixed broken links in setup - issue #12708 Removed phpMyAdmin version from User-Agent header +- issue #13084 Do not point users to setup when it is disabled 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/prefs_manage.php b/prefs_manage.php index c112184827..faed8f9c3b 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -285,9 +285,10 @@ echo '' , __('Go') . '" />' , '' , ''; -if (file_exists('setup/index.php')) { +if (file_exists('setup/index.php') && ! file_exists(CONFIG_FILE)) { // show only if setup script is available, allows to disable this message // by simply removing setup directory + // Also do not show in config exists (and setup would refuse to work) ?>