From 81d27b3593d340277400283850e2b8c8804081c9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 7 Jan 2012 07:38:00 -0500
Subject: [PATCH] RetainQueryBox in setup and user prefs

---
 libraries/config/messages.inc.php           | 2 ++
 libraries/config/setup.forms.php            | 3 ++-
 libraries/config/user_preferences.forms.php | 3 ++-
 libraries/sql_query_form.lib.php            | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index cb4b1a5fdc..48635ea65e 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -470,6 +470,8 @@ $strConfigShowPhpInfo_name = __('Show phpinfo() link');
 $strConfigShowServerInfo_name = __('Show detailed MySQL server information');
 $strConfigShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed');
 $strConfigShowSQL_name = __('Show SQL queries');
+$strConfigRetainQueryBox_desc = __('Defines whether the query box should stay on-screen after its submission');
+$strConfigRetainQueryBox_name = __('Retain query box');
 $strConfigShowStats_desc = __('Allow to display database and table statistics (eg. space usage)');
 $strConfigShowStats_name = __('Show statistics');
 $strConfigShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index d42f60d740..8ffb0b23ad 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -152,7 +152,8 @@ $forms['Sql_queries']['Sql_queries'] = array(
     'EditInWindow',
     //'QueryWindowWidth', // overridden in theme
     //'QueryWindowHeight',
-    'QueryWindowDefTab');
+    'QueryWindowDefTab',
+    'RetainQueryBox');
 $forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array(
     'Edit',
     'Explain',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 44fad4b7d8..9bc1c4ceb5 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -69,7 +69,8 @@ $forms['Sql_queries']['Sql_queries'] = array(
     'EditInWindow',
     //'QueryWindowWidth', // overridden in theme
     //'QueryWindowHeight',
-    'QueryWindowDefTab');
+    'QueryWindowDefTab',
+    'RetainQueryBox');
 $forms['Sql_queries']['Sql_box'] = array(
     'SQLQuery/Edit',
     'SQLQuery/Explain',
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index d29f27d3cc..9005f7d125 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -347,7 +347,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
     if (! $is_querywindow) {
         echo '<input type="checkbox" name="retain_query_box" value="1" '
             . 'id="retain_query_box" tabindex="133" '
-            . (empty($cfg['RetainQueryBox']) ? '' : ' checked="checked"')
+            . ($GLOBALS['cfg']['RetainQueryBox'] === false ? '' : ' checked="checked"')
             . ' />'
             . '<label for="retain_query_box">' . __('Retain query box')
             . '</label>';
-- 
2.11.4.GIT