backport

diff --git a/HISTORY b/HISTORY
index b84f14e3312ba38d21c1f40cdae6b1df140839e2..17b3f01ba17bc37a759f279187468579100e0d5c 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 phpPgAdmin History
 ------------------
 
+Version 3.5.3-dev
+-----------------
+
+Bugs
+* Fix using schema enabled dump on non-schema enabled backend
+
 Version 3.5.2
 -------------
 

diff --git a/dbexport.php b/dbexport.php
index 154fdb6af2540c06127f2f85add402c727cba629..d15199311eac869cf83739535f8e406da3e10eaa 100644 (file)
--- a/dbexport.php
+++ b/dbexport.php
@@ -3,7 +3,7 @@
         * Does an export of a database or a table (via pg_dump)
         * to the screen or as a download.
         *
-        * $Id: dbexport.php,v 1.14.2.3 2005/02/09 11:31:49 chriskl Exp $
+        * $Id: dbexport.php,v 1.14.2.4 2005/02/24 09:57:44 chriskl Exp $
         */
 
       // Prevent timeouts on large exports
@@ -78,7 +78,11 @@
                        // then..
                        if (((float) $version[1]) >= 7.4) {
                                $cmd .= " -t " . $misc->escapeShellArg($_REQUEST['table']);
-                               $cmd .= " -n " . $misc->escapeShellArg($_REQUEST['schema']);
+                               // Even though they're using a schema-enabled pg_dump, the backend database
+                               // may not support schemas.
+                               if ($data->hasSchemas()) {
+                                       $cmd .= " -n " . $misc->escapeShellArg($_REQUEST['schema']);
+                               }
                        }
                        else {
                                // This is an annoying hack needed to work around a bug in dumping

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index c87aa124fe82ba8ac36e6fe41d172fb27b3bafe8..83e0725d5f18aa8bcc379d17514c6fd8d9c2d631 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.88.2.2 2005/02/18 11:54:17 chriskl Exp $
+        * $Id: lib.inc.php,v 1.88.2.3 2005/02/24 09:57:44 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -13,7 +13,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '3.5.2';
+       $appVersion = '3.5.3-dev';
 
        // PostgreSQL and PHP minimum version
        $postgresqlMinVer = '7.0';