From 506d2904086d23fad4111f255d2371d251e2ecef Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 1 Aug 2008 20:02:21 +0000
Subject: [PATCH] bug #2004915 [bookmarks] Saved queries greater than 1000
 chars not displayed

---
 ChangeLog                | 2 ++
 libraries/import.lib.php | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0be9d8bd4..456d419dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@ danbarry
 2.11.9.0 (not yet released)
 - bug #2031221 [auth] Links to version number on login screen 
 - bug #2032707 [core] PMA does not start if ini_set() is disabled 
+- bug #2004915 [bookmarks] Saved queries greater than 1000 chars not
+  displayed, thanks to Maik Wiege - mswiege
 
 2.11.8.0 (2008-07-28)
 - patch #1987593 [interface] Table list pagination in navi, 
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index e2f562967..1344e7fec 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -177,7 +177,9 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
                 }
             }
             // check length of query unless we decided to pass it to sql.php
-            if (!$go_sql) {
+            // (if $run_query is false, we are just displaying so show
+            // the complete query in the textarea)
+            if (! $go_sql && $run_query) {
                 if ($cfg['VerboseMultiSubmit'] && ! empty($sql_query)) {
                     if (strlen($sql_query) > 50000 || $executed_queries > 50 || $max_sql_len > 1000) {
                         $sql_query = '';