From 4a3121b52f368a089d69bc4d6da0a8b6acd8603d Mon Sep 17 00:00:00 2001 From: Brian Quinion Date: Tue, 18 Dec 2012 17:39:01 +0000 Subject: [PATCH] release in postgis version string is optional --- utils/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/setup.php b/utils/setup.php index 01aa8062..ff890af9 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -125,7 +125,7 @@ pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql'); $sVersionString = $oDB->getOne('select postgis_full_version()'); - preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+) r([0-9]+)"#', $sVersionString, $aMatches); + preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches); if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2]) { echo "ERROR: PostGIS version is not correct. Expected ".CONST_Postgis_Version." found ".$aMatches[1].'.'.$aMatches[2]."\n"; -- 2.39.5