Merge remote-tracking branch 'upstream/master'

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 25d1d19f695fbca5b077c34b16b981e03bb207e2..f16d5841f9c36dd7fbe0cc411c3da1ce2a3f5b19 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1242,7 +1242,7 @@
                                                        $aTerms = array();
                                                        $aOrder = array();
 
-                                                       if ($aSearch['sHouseNumber'])
+                                                       if ($aSearch['sHouseNumber'] && sizeof($aSearch['aAddress']))
                                                        {
                                                                $sHouseNumberRegex = '\\\\m'.$aSearch['sHouseNumber'].'\\\\M';
                                                                $aOrder[] = "exists(select place_id from placex where parent_place_id = search_name.place_id and transliteration(housenumber) ~* E'".$sHouseNumberRegex."' limit 1) desc";