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 2012-08-02 12:30:57 +02:00
commit 9b6846d550
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -54,6 +54,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3548491 [interface] Inline query editor doesn't work from search results
- bug #3547825 [edit] BLOB download no longer works
- bug #3541966 [config] Error in generated configuration arrray
- bug #3553551 [GUI] Invalid HTML code in multi submits confirmation form
3.5.2.0 (2012-07-07)
- bug #3521416 [interface] JS error when editing index

3
libraries/mult_submits.inc.php
View File

@ -317,7 +317,7 @@ if (!empty($submit_mult) && !empty($what)) {
<span class="fkc_switch"><?php echo __('Foreign key check:'); ?></span>
<span class="checkbox"><input type="checkbox" name="fk_check" value="1" id="fkc_checkbox"<?php
$default_fk_check_value = (PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'foreign_key_checks\';', 0, 1) == 'ON') ? 1 : 0;
echo ($default_fk_check_value) ? ' checked=\"checked\"' : '' ?>/></span>
echo ($default_fk_check_value) ? ' checked="checked"' : '' ?>/></span>
<span id="fkc_status" class="fkc_switch"><?php echo ($default_fk_check_value) ? __('(Enabled)') : __('(Disabled)'); ?></span>
</div><?php
} ?>
@ -326,6 +326,7 @@ if (!empty($submit_mult) && !empty($what)) {
</fieldset>
<?php
}
echo '</form>';
exit;
} elseif ($mult_btn == __('Yes')) {