From fcb8c500305b5d4685c3ac1dc1f8bfcd29c2b400 Mon Sep 17 00:00:00 2001
From: "Guillaume (ioguix) de Rorthais" <ioguix@free.fr>
Date: Thu, 29 Jan 2009 23:16:54 -0500
Subject: [PATCH] Fix for bug #2484911 about empty query when editing it from a
 Select page.

---
 classes/Misc.php | 2 +-
 database.php     | 2 +-
 display.php      | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/Misc.php b/classes/Misc.php
index 172c4057..d048949e 100644
--- 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 dfccf2cd..c730a0ad 100755
--- 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 60971b7e..f38360ec 100644
--- 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'] = '';
 	
-- 
2.39.5