Merge remote-tracking branch 'upstream/master'

diff --git a/website/search.php b/website/search.php
index 0d398cc43db216255a251bc20eacb59efa9fed04..cfc1455f28c85b4bd5190efa415cbd2faa5c77dc 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -164,7 +164,10 @@
        }
        if (sizeof($aStructuredQuery) > 0) {
                $sQuery = join(', ', $aStructuredQuery);
-               $sAllowedTypesSQLList = '(\'place\',\'boundary\')';
+               if ($iMaxAddressRank < 30)
+               {
+                       $sAllowedTypesSQLList = '(\'place\',\'boundary\')';
+               }
        }
 
        if ($sQuery)
@@ -1146,7 +1149,7 @@
                                        if ($iGroupLoop > 4) break;
                                        if ($iQueryLoop > 30) break;
                                }
-//exit;
+
                                // Did we find anything?        
                                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
                                {