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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-02-12 10:07:32 +01:00
commit d9cdfb33dc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/mult_submits.inc.php
View File

@ -215,7 +215,9 @@ if (!empty($submit_mult) && !empty($what)) {
}
if (! isset($_REQUEST['fk_check'])
&& ($query_type == 'drop_tbl' || $query_type == 'row_delete')
&& ($query_type == 'drop_tbl'
|| $query_type == 'empty_tbl'
|| $query_type == 'row_delete')
) {
$default_fk_check_value = $GLOBALS['dbi']->fetchValue(
'SHOW VARIABLES LIKE \'foreign_key_checks\';', 0, 1
@ -273,7 +275,9 @@ if (!empty($submit_mult) && !empty($what)) {
}
}
if (! isset($_REQUEST['fk_check'])
&& ($query_type == 'drop_tbl' || $query_type == 'row_delete')
&& ($query_type == 'drop_tbl'
|| $query_type == 'empty_tbl'
|| $query_type == 'row_delete')
&& $default_fk_check_value
) {
$GLOBALS['dbi']->query('SET FOREIGN_KEY_CHECKS = 1;');

2
libraries/mult_submits.lib.php
View File

@ -433,7 +433,7 @@ function PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
$html .= '<form action="' . $action . '" method="post">';
$html .= PMA_URL_getHiddenInputs($_url_params);
// Display option to disable foreign key checks while dropping tables
if ($what == 'drop_tbl' || $what == 'row_delete') {
if ($what == 'drop_tbl' || $what == 'empty_tbl' || $what == 'row_delete') {
$html .= '<div id="foreignkeychk">';
$html .= '<label for="fkc_checkbox">';
$html .= __('Foreign key check:');