Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / PlaceLookup.php

diff --git a/lib-php/PlaceLookup.php b/lib-php/PlaceLookup.php
index 715f1ced3daab48dbd95b374465f44ff6e93d050..33156537459b87019ba3fe269d1d07a3f58d8032 100644 (file)
--- a/lib-php/PlaceLookup.php
+++ b/lib-php/PlaceLookup.php
@@ -445,7 +445,7 @@ class PlaceLookup
 
             if ($this->bExtraTags) {
                 if ($aPlace['extra']) {
 
             if ($this->bExtraTags) {
                 if ($aPlace['extra']) {

-                    $aPlace['sExtraTags'] = json_decode($aPlace['extra']);
+                    $aPlace['sExtraTags'] = json_decode($aPlace['extra'], true);

                 } else {
                     $aPlace['sExtraTags'] = (object) array();
                 }
                 } else {
                     $aPlace['sExtraTags'] = (object) array();
                 }


@@ -482,7 +482,7 @@ class PlaceLookup
             return (object) array();
         }
 
             return (object) array();
         }
 

-        $aFullNames = json_decode($sNames);
+        $aFullNames = json_decode($sNames, true);

         $aNames = array();
 
         foreach ($aFullNames as $sKey => $sValue) {
         $aNames = array();
 
         foreach ($aFullNames as $sKey => $sValue) {