Merge branch 'cmake-port' into master

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

diff --combined website/reverse.php
index 3254e710bda5048ee68b7f611ed6f30f3819d4a3,79a950124d8e077f7ed98418d18073d73ddec9fd..fd1f5c27c2f7cb43683d4315dee6bc5f67da67d9
--- 1/website/reverse.php
--- 2/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 ac0b4bdd65b25279fb12ee21da5cf3d441fcb900,497ff598359821bdae0c3117a7c5b8efbde6ae86..8b160f8f72d98d435b69dd1eb4523ec4773d1b68
--- 1/website/search.php
--- 2/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);