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

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

Browse Source
This commit is contained in:
Weblate 2012-08-26 15:16:43 +02:00
commit 65b3541e8e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

9
js/makegrid.js
View File

@ -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('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');