From f09556c93bcb6d93dd6b6efbeb52aafb848c1541 Mon Sep 17 00:00:00 2001
From: chriskl <chriskl>
Date: Mon, 7 Jun 2004 15:39:38 +0000
Subject: [PATCH] fix export problems pre 7.3

---
 HISTORY        |  1 +
 dataexport.php | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index bc64f59e..ef055051 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,6 +12,7 @@ Version 3.4.1
 
 Bugs
 * Fix export of mixed case tables pre 7.4
+* Fix table export problems pre 7.3
 
 Version 3.4
 -----------
diff --git a/dataexport.php b/dataexport.php
index bd3c78f4..7cb22f36 100644
--- a/dataexport.php
+++ b/dataexport.php
@@ -4,7 +4,7 @@
 	 * Does an export to the screen or as a download.  This checks to
 	 * see if they have pg_dump set up, and will use it if possible.
 	 *
-	 * $Id: dataexport.php,v 1.14 2004/04/12 07:50:32 chriskl Exp $
+	 * $Id: dataexport.php,v 1.15 2004/06/07 15:39:38 chriskl Exp $
 	 */
 
 	$extensions = array(
@@ -35,7 +35,7 @@
 					$url = 'dbexport.php?database=' . urlencode($_REQUEST['database']);
 					$url .= '&what=' . urlencode($_REQUEST['what']);
 					$url .= '&table=' . urlencode($_REQUEST['table']);
-					$url .= '&schema=' . urlencode($_REQUEST['schema']);
+					if ($data->hasSchemas()) $url .= '&schema=' . urlencode($_REQUEST['schema']);
 					$url .= '&d_format=' . urlencode($_REQUEST['d_format']);
 					$url .= '&output=' . urlencode($_REQUEST['output']);
 					if (isset($_REQUEST['d_oids'])) $url .= '&d_oids=' . urlencode($_REQUEST['d_oids']);
@@ -56,7 +56,7 @@
 					$url = 'dbexport.php?database=' . urlencode($_REQUEST['database']);
 					$url .= '&what=' . urlencode($_REQUEST['what']);
 					$url .= '&table=' . urlencode($_REQUEST['table']);
-					$url .= '&schema=' . urlencode($_REQUEST['schema']);
+					if ($data->hasSchemas()) $url .= '&schema=' . urlencode($_REQUEST['schema']);
 					$url .= '&output=' . urlencode($_REQUEST['output']);
 					if (isset($_REQUEST['s_clean'])) $url .= '&s_clean=' . urlencode($_REQUEST['s_clean']);
 					$url .= "&" . SID;
@@ -73,13 +73,13 @@
 					$url = 'dbexport.php?database=' . urlencode($_REQUEST['database']);
 					$url .= '&what=' . urlencode($_REQUEST['what']);
 					$url .= '&table=' . urlencode($_REQUEST['table']);
-					$url .= '&schema=' . urlencode($_REQUEST['schema']);
+					if ($data->hasSchemas()) $url .= '&schema=' . urlencode($_REQUEST['schema']);
 					$url .= '&sd_format=' . urlencode($_REQUEST['sd_format']);
 					$url .= '&output=' . urlencode($_REQUEST['output']);
 					if (isset($_REQUEST['sd_clean'])) $url .= '&sd_clean=' . urlencode($_REQUEST['sd_clean']);
 					if (isset($_REQUEST['sd_oids'])) $url .= '&sd_oids=' . urlencode($_REQUEST['sd_oids']);
 					$url .= "&" . SID;
-					
+
 					header("Location: {$url}");
 					exit;
 				}
-- 
2.39.5