From be8b45086c0763bd6098321f6f51f58db2215ac3 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sat, 8 Jun 2002 16:45:16 +0000
Subject: [PATCH] bug #564741

---
 ChangeLog        | 3 ++-
 tbl_replace.php3 | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb36f53e4..2ef080425 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,8 @@ $Source$
     * lang/norwegian.inc.php3: Updates, thanks again to
       Sven-Erik Andersen <sven-erik at users.sourceforge.net>.
     * lang/polish.inc.php3: Small corrections, thanks again to
-      Jakub Wilk <ubanus at users.sourceforge.net>
+      Jakub Wilk <ubanus at users.sourceforge.net>.
+    * tbl_replace.php3: Fixed bug #564741 (CURDATE doesn't need any arguments).
 
 2002-06-07 Marc Delisle  <lem9@users.sourceforge.net>
     * translators.html: updates (try to have only one official translator,
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index e8d494156..cd653c492 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -219,8 +219,9 @@ else {
 
         if (empty($funcs[$encoded_key])) {
             $valuelist .= $val . ', ';
-        } else if ($val == '\'\''
-                   && (ereg('^(NOW|CURDATE|CURTIME|UNIX_TIMESTAMP|RAND|USER|LAST_INSERT_ID)$', $funcs[$encoded_key]))) {
+        } else if (($val == '\'\''
+                   && ereg('^(UNIX_TIMESTAMP|RAND|LAST_INSERT_ID)$', $funcs[$encoded_key]))
+                   || ereg('^(NOW|CURDATE|CURTIME|USER)$', $funcs[$encoded_key])) {
             $valuelist .= $funcs[$encoded_key] . '(), ';
         } else {
             $valuelist .= $funcs[$encoded_key] . '(' . $val . '), ';