Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-03-25 08:18:50 +01:00
commit 686c5fe97c
2 changed files with 2 additions and 1 deletions

View File

@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
4.6.1 (not yet released)
- issue #12120 PMA_Util not found in insert_edit.lib.php
- issue #12118 Fixed activation of some languages
- issue #12121 Fixed error in 3NF step of normalization
4.6.0.0 (2016-03-22)
+ issue #11456 Disabled storage engines

View File

@ -60,7 +60,7 @@ if (isset($_REQUEST['getNewTables3NF'])) {
$dependencies = json_decode($_REQUEST['pd']);
$tables = json_decode($_REQUEST['tables']);
$newTables = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
PMA_Response::getInstance()->disable();
PMA\libraries\Response::getInstance()->disable();
PMA_headerJSON();
echo json_encode($newTables);
exit;