hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for postgis being in the default template - not an error if it already is installed

Browse Source
This commit is contained in:
Brian Quinion
2015-10-07 14:44:59 +01:00
parent f24b904f9a
commit 347f8e57c7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osm2pgsql

Submodule osm2pgsql updated: 8179cdb67e...55b6b4302c

2
utils/setup.php
View File

@@ -134,7 +134,7 @@
pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql'); pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql'); pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
} else { } else {
pgsqlRunScript('CREATE EXTENSION postgis'); pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS postgis');
} }
if ($fPostgisVersion < 2.1) { if ($fPostgisVersion < 2.1) {
// Function was renamed in 2.1 and throws an annoying deprecation warning // Function was renamed in 2.1 and throws an annoying deprecation warning