Permalink
Browse files

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

  • Loading branch information...
1 parent 2140f09 commit c0c21d4d121c9545f2224f7b61ce0dcb002e2fb2 @vrana committed Jun 8, 2011
Showing with 3 additions and 2 deletions.
  1. +1 −1 adminer/edit.inc.php
  2. +1 −1 adminer/include/functions.inc.php
  3. +1 −0 changes.txt
View
@@ -78,7 +78,7 @@
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";
@@ -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";
View
@@ -2,6 +2,7 @@ Adminer 3.3.0-dev:
Use Esc to disable in-place edit
Shortcut for database privileges
Append new index with auto index selection (bug #3282127)
+Preserve original timestamp value in multiple update (bug #3312614)
Bit type default value
Display foreign key name in tooltip
Display default column value in table overview

0 comments on commit c0c21d4

Please sign in to comment.