Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

This commit is contained in:
Weblate 2017-03-15 16:18:35 +01:00
commit bc2266a9e7
2 changed files with 3 additions and 1 deletions

View File

@ -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'

View File

@ -285,9 +285,10 @@ echo '</div>'
, __('Go') . '" />'
, '</form>'
, '</div>';
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)
?>
<div class="group">
<h2><?php echo __('More settings') ?></h2>