gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13570 from Achilles-96/Setup-Improvements

Browse Source 
Fixes fatal error during setup #13564
This commit is contained in:
Michal Čihař 2017-08-06 07:44:55 -04:00 committed by GitHub
commit f03ebfe537
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/config.php
View File

@ -41,6 +41,7 @@ if (Core::ifSetOr($_POST['submit_clear'], '')) {
// Output generated config file
//
Core::downloadHeader('config.inc.php', 'text/plain');
$response->disable();
echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
exit;
} else {

2
setup/lib/common.inc.php
View File

@ -22,6 +22,8 @@ require_once './libraries/common.inc.php';
require_once './libraries/config/config_functions.lib.php';
require_once './libraries/config/messages.inc.php';
require_once './libraries/user_preferences.lib.php';
require_once './libraries/database_interface.inc.php';
require_once './setup/lib/ConfigGenerator.php';
// use default error handler
restore_error_handler();