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

Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

Browse Source
This commit is contained in:
Weblate 2015-12-07 06:59:54 +01:00
commit 39c97184e8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
- issue #11695 PMA_getDataForDeleteUsers() warning
- issue #11698 Cannot create user on Percona Server
- issue Properly report error on connecting
- issue #11706 Database export template not saving compression option
4.5.2.0 (2015-11-23)
- issue #11589 Incorrect parameter in mysqli_fetch_fields()

4
js/export.js
View File

@ -320,14 +320,14 @@ AJAX.registerOnload('export.js', function () {
// For separate-file exports only ZIP compression is allowed
$('input[type="checkbox"][name="as_separate_files"]').change(function(){
if (! $(this).attr('checked')) {
if ($(this).is(':checked')) {
$('#compression').val('zip');
}
});
$('#compression').change(function(){
if ($('option:selected').val() !== 'zip') {
$('input[type="checkbox"][name="as_separate_files"]').attr('checked', false);
$('input[type="checkbox"][name="as_separate_files"]').prop('checked', false);
}
});