Fix export to work with release candidates and beta releases as well as finals

diff --git a/HISTORY b/HISTORY
index 497f29a39defca39228f9909b4c5ea9947a03305..7bbe2767124c91ccc901c9c7e58989ee7e6be6d6 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -9,6 +9,8 @@ Bugs
 * Ensure login frame is always at top level (Russell Smith)
 * Fix non-ASCII characters inserted in Unicode databases as HTML entities with
  non-UTF8 web servers (Markus Bertheau)
+* Fix export to work with release candidates and beta releases as well as finals
+ (Russell Smith)
 
 Version 3.5.1
 -------------

diff --git a/dbexport.php b/dbexport.php
index 31793ec9f5e4df462d852f6ac50626572fccd66c..b052e136622501c7441f57cf92720b9ffcccf2ee 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.15 2004/12/06 03:03:00 chriskl Exp $
+        * $Id: dbexport.php,v 1.16 2005/02/01 22:03:00 mr-russ Exp $
         */
 
        // Include application functions
@@ -69,7 +69,7 @@
                        
                        // Obtain the pg_dump version number
                        $version = array();
-                       preg_match("/(\d+(?:\.\d+)?)(?:\.\d+)?$/", exec($exe . " --version"), $version);
+                       preg_match("/(\d+(?:\.\d+)?)(?:\.\d+)?.*$/", exec($exe . " --version"), $version);
                        
                        // If we are 7.4 or higher, assume they are using 7.4 pg_dump and
                        // set dump schema as well.  Also, mixed case dumping has been fixed