Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
89ed135ab1
@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
|
||||
+ rfe #1650 Support a default page in designer
|
||||
+ rfe #1651 Allow copying mutiple rows
|
||||
+ rfe #1643 No SQL query for loading data
|
||||
+ rfe #1653 New data validation feature and datetime type
|
||||
|
||||
4.4.2.0 (not yet released)
|
||||
- bug #4835 PMA_hideShowConnection not called after submit_num_fields
|
||||
|
||||
@ -402,6 +402,7 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
return true;
|
||||
} else if (theType == "datetime" || theType == "timestamp") {
|
||||
var tmstmp = false;
|
||||
dt_value = dt_value.trim();
|
||||
if (dt_value == "CURRENT_TIMESTAMP") {
|
||||
return true;
|
||||
}
|
||||
@ -412,8 +413,11 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
return true;
|
||||
}
|
||||
var dv = dt_value.indexOf(" ");
|
||||
if (dv == -1) {
|
||||
return false;
|
||||
if (dv == -1) { // Only the date component, which is valid
|
||||
if (! isDate(dt_value, tmstmp)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
if (! (isDate(dt_value.substring(0, dv), tmstmp)
|
||||
&& isTime(dt_value.substring(dv + 1)))) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user