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

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

Browse Source
This commit is contained in:
Weblate 2014-01-15 21:15:57 +01:00
commit 189b72b99b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
- bug #4226 Notice: Undefined index: pma_config_loading
- bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
- bug #4204 Reloading user privileges hides user groups submenu
- bug #4231 DATE columns quick edit decrement by one day
4.1.4.0 (2014-01-07)
- bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times

11
js/makegrid.js
View File

@ -989,9 +989,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
) {
$input_field.val(current_datetime_value);
} else {
var date;
var date = new Date(
current_datetime_value.substring(0, 4),
parseInt(current_datetime_value.substring(5, 7)) - 1,
parseInt(current_datetime_value.substring(8, 10))
);
if (current_datetime_value.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{6}$/)) {
date = new Date(current_datetime_value.substring(0, 10));
var hour = current_datetime_value.substring(11, 13);
var min = current_datetime_value.substring(14, 16);
var sec = current_datetime_value.substring(17, 19);
@ -999,10 +1002,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
var micro = current_datetime_value.substring(23);
date.setHours(hour, min, sec, milli);
date.setMicroseconds(micro);
var day = current_datetime_value.substring(8, 10);
date.setDate(day);
} else {
date = new Date(current_datetime_value);
}
$editArea.datetimepicker('setDate', date);
}