Merge pull request #986 from mtmail/php-replace-sizeof

[nominatim.git] / lib / PlaceLookup.php

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 4fce7e3683a74a32d1b6a95faca75e731d831446..bd6fa171d22cf2eaac3bdd7f0e010b5fef0f9f0a 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -164,12 +164,12 @@ class PlaceLookup
 
         $aResults = $this->lookup(array($iPlaceID => new Result($iPlaceID)));
 
-        return sizeof($aResults) ? reset($aResults) : null;
+        return empty($aResults) ? null : reset($aResults);
     }
 
     public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
     {
-        if (!sizeof($aResults)) {
+        if (empty($aResults)) {
             return array();
         }
         $aSubSelects = array();
@@ -408,7 +408,7 @@ class PlaceLookup
 
         if (CONST_Debug) var_dump($aSubSelects);
 
-        if (!sizeof($aSubSelects)) {
+        if (empty($aSubSelects)) {
             return array();
         }
 
@@ -462,7 +462,7 @@ class PlaceLookup
         return $aPlaces;
     }
 
-    private function getAddressDetails($iPlaceID, $bAll, $sHousenumber)
+    public function getAddressDetails($iPlaceID, $bAll = false, $sHousenumber = -1)
     {
         $sSQL = 'SELECT *,';
         $sSQL .= '  get_name_by_language(name,'.$this->aLangPrefOrderSql.') as localname';