mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-14 02:23:59 +02:00
Code Issues Releases Wiki Activity

Preserve original timestamp value in multiple update (bug #3312614)

Browse Source
This commit is contained in:
Jakub Vrana
2011-06-08 12:48:39 +02:00
parent 2140f09b68
commit c0c21d4d12
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/edit.inc.php
View File

@@ -78,7 +78,7 @@ if ($fields) {
if (!$_POST["save"] && is_string($value)) {
$value = $adminer->editVal($value, $field);
}
$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($where && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
$value = "";
$function = "now";

2
adminer/include/functions.inc.php
View File

@@ -722,7 +722,7 @@ function process_input($field) {
return null;
}
if ($function == "orig") {
return false;
return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
}
if ($function == "NULL") {
return "NULL";