Work with $display_query only if set (Marc spotted this out).

NenadGajic · Aug 17, 2004 · be3d8a7 · be3d8a7
1 parent 2102df6
commit be3d8a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-08-17 Michal Čihař  <michal@cihar.com>
+    * sql.php: Work with $display_query only if set (Marc spotted this out).
+
 2004-08-17 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_select.php, config.inc.php, libraries/config_import.lib.php,
       libraries/common.lib.php: move search operators to config file,

diff --git a/sql.php b/sql.php
@@ -319,10 +319,12 @@
         } else {
             $full_sql_query  = $sql_query . $sql_limit_to_append;
         }
-        if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) {
-            $display_query  = $regs[1] . $sql_limit_to_append . $regs[3];
-        } else {
-            $display_query  = $display_query . $sql_limit_to_append;
+        if (isset($display_query)) {
+            if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) {
+                $display_query  = $regs[1] . $sql_limit_to_append . $regs[3];
+            } else {
+                $display_query  = $display_query . $sql_limit_to_append;
+            }
         }
         unset($sql_limit_to_append);
     } else {