From: mr-russ <mr-russ>
Date: Wed, 2 Feb 2005 21:15:04 +0000 (+0000)
Subject: Fix export to work with release candidates and beta releases as well as
X-Git-Tag: REL_3-5-2~8
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=c4b0e49129e12c156e55ee8756564f77a72a2136;p=phppgadmin.git

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

diff --git a/HISTORY b/HISTORY
index 3928cddf..a31062d4 100644
--- 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 8f3ba092..18fcbaea 100644
--- 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