bug 556105

ChangeLog

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-05-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * read_dump.php3, bug 556105: do not execute a bookmark if asked to
+      only view it
+
 2002-05-19 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/german.inc.php3:
       - Updated serveral untranslated strings.

read_dump.php3

@@ -327,8 +327,10 @@ if ($sql_query != '') {
         $sql_query_cpy = implode(";\n", $pieces) . ';';
     }
 
+    // really run the query?
+    if ($view_bookmark == 0) {
         // Only one query to run
-    if ($pieces_count == 1 && !empty($pieces[0]) && $view_bookmark == 0) {
+        if ($pieces_count == 1 && !empty($pieces[0])) {
             // sql.php3 will stripslash the query if get_magic_quotes_gpc
             if (get_magic_quotes_gpc() == 1) {
                 $sql_query = addslashes($pieces[0]);
@@ -356,6 +358,7 @@ if ($sql_query != '') {
                 }
             } // end for
         } // end else if
+    } // end if (really run the query)
     unset($pieces);
 } // end if