From ff0b627cc7d3a956090612e96c02d6138cf1fe8e Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 12 Mar 2009 20:18:42 +0000
Subject: [PATCH] bug #2682140 UUID() and CURRENT_USER() should not accept
 arguments

---
 ChangeLog       | 1 +
 tbl_replace.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5e4cdea33..c8eaa43bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2609346 [operations] Fix copying views.
 - rfe #2127983 Readd documentation link, it does not protect against anything.
 - bug #1675249 [doc] Apache reverse proxy and cookies FAQ
+- bug #2682140 UUID() and CURRENT_USER() should not accept arguments
 
 3.1.3.0 (2009-02-28)
 + [lang] Turkish update, thanks to Burak Yavuz
diff --git a/tbl_replace.php b/tbl_replace.php
index 526c70308..4448d3db7 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -160,6 +160,8 @@ $func_no_param = array(
     'RAND',
     'USER',
     'LAST_INSERT_ID',
+    'UUID',
+    'CURRENT_USER',
 );
 
 foreach ($loop_array as $rowcount => $primary_key) {