From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 16 Mar 2016 18:45:18 +0000 (+0100)
Subject: Merge branch 'cmake-port' into master
X-Git-Tag: v3.0.0~197
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/6fc32d9645f98ec39c8773d6bf01cc2f6d4969de?hp=-c

Merge branch 'cmake-port' into master

Conflicts:
	CMakeLists.txt
	lib/init.php
	settings/settings.php
---

6fc32d9645f98ec39c8773d6bf01cc2f6d4969de
diff --combined website/reverse.php
index 3254e710,79a95012..fd1f5c27
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -1,7 -1,8 +1,8 @@@
  <?php
  	@define('CONST_ConnectionBucket_PageType', 'Reverse');
  
- 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+ 	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+ 	require_once(CONST_BasePath.'/lib/init-website.php');
  	require_once(CONST_BasePath.'/lib/log.php');
  	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
  	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
@@@ -102,12 -103,9 +103,12 @@@
  		$oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
  
  		$fRadius = $fDiameter = getResultDiameter($aPlace);
 -		$aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'],$aPlace['lon'],$aPlace['lat'],$fRadius);
 +		$aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius);
  
 -		$aPlace = array_merge($aPlace, $aOutlineResult);
 +		if ($aOutlineResult)
 +		{
 +			$aPlace = array_merge($aPlace, $aOutlineResult);
 +		}
  	}
  	else
  	{
diff --combined website/search.php
index ac0b4bdd,497ff598..8b160f8f
--- a/website/search.php
+++ b/website/search.php
@@@ -1,7 -1,8 +1,8 @@@
  <?php
  	@define('CONST_ConnectionBucket_PageType', 'Search');
  
- 	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+ 	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+ 	require_once(CONST_BasePath.'/lib/init-website.php');
  	require_once(CONST_BasePath.'/lib/log.php');
  	require_once(CONST_BasePath.'/lib/Geocode.php');
  
@@@ -14,7 -15,7 +15,7 @@@
  	$fLon = CONST_Default_Lon;
  	$iZoom = CONST_Default_Zoom;
  
 -	$oGeocode =& new Geocode($oDB);
 +	$oGeocode = new Geocode($oDB);
  
  	$aLangPrefOrder = getPreferredLanguages();
  	$oGeocode->setLanguagePreference($aLangPrefOrder);