Fix for bug #2484911 about empty query when editing it from a Select page.

diff --git a/classes/Misc.php b/classes/Misc.php
index 172c40574f0f29b912f69c857d5aabb11e5417ec..d048949ec546c3ca1fd1c0f47482900a927c7809 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -594,7 +594,7 @@
                                                'sql' => array (
                                                        'title' => $lang['strsql'],
                                                        'url'   => 'database.php',
-                                                       'urlvars' => array('subject' => 'database', 'action' => 'sql'),
+                                                       'urlvars' => array('subject' => 'database', 'action' => 'sql', 'new' => 1),
                                                        'help'  => 'pg.sql',
                                                        'tree'  => false,
                                                        'icon'  => 'SqlEditor'

diff --git a/database.php b/database.php
index dfccf2cd506e5992c06d19ac688987b317c57690..c730a0ad1b1a4f6e3c6ba778f6ac4f3a312f9a37 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -828,7 +828,7 @@
                global $data, $misc;
                global $lang;
 
-               if (!isset($_SESSION['sqlquery'])) $_SESSION['sqlquery'] = '';
+               if ((!isset($_SESSION['sqlquery'])) || isset($_REQUEST['new'])) $_SESSION['sqlquery'] = '';
 
                $misc->printTrail('database');
                $misc->printTabs('database','sql');

diff --git a/display.php b/display.php
index 60971b7efe9bbd27876a83434d1b34132b517ba7..f38360ec99a3877836644e6c88fb3fb447829e1b 100644 (file)
--- a/display.php
+++ b/display.php
@@ -252,7 +252,7 @@
         */
        function doBrowse($msg = '') {
                global $data, $conf, $misc, $lang;
-               
+
                $save_history = false;
                // If current page is not set, default to first page
                if (!isset($_REQUEST['page']))
@@ -267,11 +267,12 @@
                else {
                        $subject = '';
                }
-       
+
                $misc->printTrail(isset($subject) ? $subject : 'database');
                
                if (isset($object)) {
                        if (isset($_REQUEST['query'])) {
+                               $_SESSION['sqlquery'] = $_REQUEST['query'];
                                $misc->printTitle($lang['strselect']);
                                $type = 'SELECT';
                        } else {
@@ -287,7 +288,7 @@
 
                // If 'sortkey' is not set, default to ''
                if (!isset($_REQUEST['sortkey'])) $_REQUEST['sortkey'] = '';
-       
+
                // If 'sortdir' is not set, default to ''
                if (!isset($_REQUEST['sortdir'])) $_REQUEST['sortdir'] = '';