From b94e87187f84ee95bb7bd2217bff595a009e94f7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 13 Oct 2006 01:46:21 +0000
Subject: [PATCH] bug #1566219, automated timestamp values

---
 ChangeLog      | 3 +++
 tbl_change.php | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3972f5f42..387cc1d38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-10-12 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_change.php: bug #1566219, automated timestamp values
+
 2006-10-12 Michal Čihař  <michal@cihar.com>
     * Documentation.html: Change CVS instructions to SVN.
     * scripts/create-release.sh: Switch to SVN:
diff --git a/tbl_change.php b/tbl_change.php
index 19aa643ea..90cd28fe4 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -457,7 +457,9 @@ foreach ($loop_array AS $vrowcount => $vrow) {
             } // end if... else...
             // loic1: if a timestamp field value is not included in an update
             //        statement MySQL auto-update it to the current timestamp
-            $backup_field  = ($row_table_def['True_Type'] == 'timestamp')
+            // lem9:  however, things have changed since MySQL 4.1, so
+            //        it's better to set a fields_prev in this situation
+            $backup_field  = (PMA_MYSQL_INT_VERSION < 40100 && $row_table_def['True_Type'] == 'timestamp')
                            ? ''
                            : '<input type="hidden" name="fields_prev' . $vkey . '[' . urlencode($field) . ']" value="' . urlencode($vrow[$rowfield]) . '" />';
         } else {