From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Tue, 18 Dec 2012 17:39:01 +0000 (+0000)
Subject: release in postgis version string is optional
X-Git-Tag: v2.2.0~147
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4a3121b52f368a089d69bc4d6da0a8b6acd8603d?ds=inline

release in postgis version string is optional
---

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";