diff --git a/ChangeLog b/ChangeLog
index 914418224..980ad055c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-07-31 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_replace_fields: bug 780793: a '+' sign in ENUM (or SET 
+      or a foreign key) was wrongly urldecoded to a space
+ 
 2003-07-30 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_move_copy.php3: wrong Missing message
 
diff --git a/tbl_replace_fields.php3 b/tbl_replace_fields.php3
index 0723253bd..2ccd0b503 100755
--- a/tbl_replace_fields.php3
+++ b/tbl_replace_fields.php3
@@ -132,7 +132,9 @@ if (!$check_stop) {
                             if ($val == 'null') {
                                 // void
                             } else {
-                                $val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
+                                // the data here is not urlencoded!
+                                //$val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
+                                $val = "'" . PMA_sqlAddslashes($val) . "'";
                             }
                         } else {
                             $val     = "''";
@@ -143,7 +145,9 @@ if (!$check_stop) {
                     $f = 'field_' . md5($key);
                     if (!empty($$f)) {
                         $val = implode(',', $$f);
-                        $val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
+                        // the data here is not urlencoded!
+                        //$val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
+                        $val = "'" . PMA_sqlAddslashes($val) . "'";
                     } else {
                         $val = "''";
                     }
@@ -156,7 +160,9 @@ if (!$check_stop) {
                         if ($val == 'null') {
                             // void
                         } else {
-                            $val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
+                            // the data here is not urlencoded!
+                            //$val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
+                            $val = "'" . PMA_sqlAddslashes($val) . "'";
                         }
                     } else {
                         $val     = "''";