Permalink
Browse files

release in postgis version string is optional

  • Loading branch information...
1 parent a293328 commit 4a3121b52f368a089d69bc4d6da0a8b6acd8603d @twain47 committed Dec 18, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 utils/setup.php
View
@@ -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";

0 comments on commit 4a3121b

Please sign in to comment.