From 155b25a09412a05d273fae799b0c3e0fdf12bb5b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 26 Aug 2012 18:44:45 +0530 Subject: [PATCH] bug #3561224 [edit] cell edit date field with empty date fills in current date --- ChangeLog | 1 + js/makegrid.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8800c15556..076c4bfcc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - bug #3540922 [edit] Error searching table with many fields - bug #3555104 [edit] Cannot copy a DB with table & views - bug #3559925 [privileges] Incorrect updating of the list of users +- bug #3561224 [edit] cell edit date field with empty date fills in current date 3.5.2.2 (2012-08-12) - [security] Fixed XSS vulnerabilities, see PMASA-2012-4 diff --git a/js/makegrid.js b/js/makegrid.js index 6355305aa1..cae77e318d 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -970,10 +970,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // force to restore modified $input_field value after adding datepicker // (after adding a datepicker, the input field doesn't display the time anymore, only the date) - if (!is_null) { - $editArea.datetimepicker('setDate', current_datetime_value); + if (is_null + || current_datetime_value == '0000-00-00' + || current_datetime_value == '0000-00-00 00:00:00' + ) { + $input_field.val(current_datetime_value); } else { - $input_field.val(''); + $editArea.datetimepicker('setDate', current_datetime_value); } $editArea.append('
' + g.cellEditHint + '
');