Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 1517b317102502d75b175ee39949c96af8ce9434..3ed66237e955cdff43da2122cbcfe6bad6f52d19 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -169,7 +169,7 @@
        {
                $aResult = array(array(join(' ',$aWords)));
                $sFirstToken = '';
-               if ($iDepth < 8) {
+               if ($iDepth < 7) {
                        while(sizeof($aWords) > 1)
                        {
                                $sWord = array_shift($aWords);
@@ -884,7 +884,7 @@
                return $iPlaceID;
        }
 
-       function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank)
+       function loadStructuredAddressElement(&$aStructuredQuery, &$iMinAddressRank, &$iMaxAddressRank, &$aAddressRankList, $aParams, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
        {
                if (!isset($_GET[$sKey])) return false;
                $sValue = trim($_GET[$sKey]);
@@ -895,5 +895,11 @@
                        $iMinAddressRank = $iNewMinAddressRank;
                        $iMaxAddressRank = $iNewMaxAddressRank;
                }
+               if ($aItemListValues) $aAddressRankList = array_merge($aAddressRankList, $aItemListValues);
                return true;
        }
+
+       function addQuotes($s)
+       {
+               return "'".$s."'";
+       }