From 313a06cce254d1e7b75d4c2f11d91f35981b200f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 7 Apr 2004 19:34:42 +0000
Subject: [PATCH] bug 921939

---
 ChangeLog                     | 3 +++
 libraries/display_tbl.lib.php | 2 +-
 tbl_row_delete.php            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ba6ef6d0..f56068c8c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ $Source$
 2004-04-07 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php, bug 931034, big numbers data entry,
       thanks to Dmitry (yrtimd)
+    * tbl_row_delete.php, libraries/display_tbl.lib.php: bug 921939,
+      problem with multi-row delete and quotes in WHERE clause,
+      thanks to Ryan Schmidt (ryandesign)
 
 2004-04-06 Marc Delisle  <lem9@users.sourceforge.net>
     * main.php, complete the fix for bug 922054
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 5b7241244..0a7507f56 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1894,7 +1894,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             echo '                    <input type="submit" name="submit_mult" value="row_edit" title="' . $GLOBALS['strEdit'] . '" />' . "\n";
             echo '&nbsp;<input type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '" />' . "\n";
         }
-        echo '<input type="hidden" name="sql_query" value="' . $sql_query . '" />' . "\n";
+        echo '<input type="hidden" name="sql_query" value="' . $encoded_sql_query . '" />' . "\n";
         echo '<input type="hidden" name="pos" value="' . $pos . '" />' . "\n";
         echo '<input type="hidden" name="url_query" value="' . $GLOBALS['url_query'] . '" />' . "\n";
         echo '<br />' . "\n";
diff --git a/tbl_row_delete.php b/tbl_row_delete.php
index 754c1b5ba..d85eed51e 100644
--- a/tbl_row_delete.php
+++ b/tbl_row_delete.php
@@ -73,7 +73,7 @@ if (!empty($submit_mult)) {
             }
             
             if (isset($original_sql_query)) {
-                $sql_query = $original_sql_query;
+                $sql_query = urldecode($original_sql_query);
             }
             
             if (isset($original_url_query)) {