From 5e5d35dfae36df5b1f90e930200074d5b293418a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 5 Aug 2003 18:14:37 +0000
Subject: [PATCH] Bookmark all SQL queries and not only the last one (bug
 #780569).

---
 ChangeLog      | 2 ++
 read_dump.php3 | 1 +
 sql.php3       | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index de775affd..8faafb355 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@ $Source$
       not be set to NULL (bug #783533).
     * tbl_move_copy.php3: Use database we're working on to avoid some problems
       with replicated databases (bug #780439).
+    * read_dump.php3, sql.php3: Bookmark all SQL queries and not only the last
+      one (bug #780569).
 
 2003-08-05 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.data.php3: bug 779453, wrong count
diff --git a/read_dump.php3 b/read_dump.php3
index 692d0196d..ac17dabda 100644
--- a/read_dump.php3
+++ b/read_dump.php3
@@ -241,6 +241,7 @@ if ($sql_query != '') {
                 $a_sql_query = $pieces[$i];
                 if ($i == $pieces_count - 1 && eregi('^SELECT', $a_sql_query)) {
                     $complete_query = $sql_query;
+                    $display_query = $sql_query;
                     $sql_query = $a_sql_query;
                     include('./sql.php3');
                     exit();
diff --git a/sql.php3 b/sql.php3
index 4aaf706cd..09fa4d0f2 100755
--- a/sql.php3
+++ b/sql.php3
@@ -745,7 +745,7 @@ else {
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
     <input type="hidden" name="fields[dbase]" value="<?php echo htmlspecialchars($db); ?>" />
     <input type="hidden" name="fields[user]" value="<?php echo $cfg['Bookmark']['user']; ?>" />
-    <input type="hidden" name="fields[query]" value="<?php echo urlencode($sql_query); ?>" />
+    <input type="hidden" name="fields[query]" value="<?php echo urlencode(isset($complete_query) ? $complete_query : $sql_query); ?>" />
     <input type="text" name="fields[label]" value="" />
     <input type="submit" name="store_bkm" value="<?php echo $strBookmarkThis; ?>" />
 </form>