From 73ab7f380bc2db43a08919247ce1fe418d412d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 Mar 2017 13:45:43 +0200 Subject: [PATCH] Allow to run setup on the demo server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13083 Signed-off-by: Michal Čihař --- doc/config.rst | 6 ++++++ setup/index.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/config.rst b/doc/config.rst index f647871d99..5efd346242 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -3214,6 +3214,12 @@ Developer Enable to let server present itself as demo server. This is used for `phpMyAdmin demo server `_. + It currently changes following behavior: + + * There is welcome message on the main page. + * There is footer information about demo server and used git revision. + * The setup script is enabled even with existing configuration. + .. _config-examples: Examples diff --git a/setup/index.php b/setup/index.php index 97d446251e..594716dcfe 100644 --- a/setup/index.php +++ b/setup/index.php @@ -12,7 +12,7 @@ */ require './lib/common.inc.php'; -if (file_exists(CONFIG_FILE)) { +if (file_exists(CONFIG_FILE) && ! $cfg['DBG']['demo']) { PMA_fatalError(__('Configuration already exists, setup is disabled!')); }