Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-04-21 11:33:43 +02:00
commit d238f2a701
2 changed files with 2 additions and 1 deletions

View File

@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
- issue #12197 Fix parsing of queries with double \
- issue #12202 Fixed setting of language from user configuration
- issue #12200 Fixed check for ndb version
- issue #12206 Fixed loading of configuration file
4.6.0.0 (2016-03-22)
+ issue #11456 Disabled storage engines

View File

@ -57,7 +57,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
// Load config file from the server
//
$cfg = array();
include_once $config_file_path;
include $config_file_path;
$GLOBALS['ConfigFile']->setConfigData($cfg);
header('HTTP/1.1 303 See Other');
header('Location: index.php' . URL::getCommon());