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

finals

diff --git a/HISTORY b/HISTORY
index 3928cddfdf2d7d1ae512d954edd80d95c987897b..a31062d4ad85c58c0145a5f5f382950ec9a027fa 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,13 @@
 phpPgAdmin History
 ------------------
 
+Version 3.5.2-dev
+-----------------
+
+Bugs
+* 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 8f3ba092abd1b00cf9a0077f915d84cccf579b4e..18fcbaea47e775fd044de946cee845fc174921cc 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.1 2004/12/06 03:07:17 chriskl Exp $
+        * $Id: dbexport.php,v 1.14.2.2 2005/02/02 21:15:04 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