From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 Sep 2016 19:53:30 +0000 (+0200)
Subject: fix merge error
X-Git-Tag: deploy~423
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c792691c5280458499d6e3a6b657bd4cb9661d36

fix merge error
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index b6458725..692f4093 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1160,6 +1160,7 @@ class Geocode
                                 && $aWordFrequencyScores[$aSearch['aName'][reset($aSearch['aName'])]] < CONST_Search_NameOnlySearchFrequencyThreshold
                             ) {
                                 //$aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join(array_merge($aSearch['aAddress'], $aSearch['aAddressNonSearch']), ",")."]";
+                                $aTerms[] = "array_cat(nameaddress_vector,ARRAY[]::integer[]) @> ARRAY[".join($aSearch['aAddress'],",")."]";
                             } else {
                                 $aTerms[] = "nameaddress_vector @> ARRAY[".join($aSearch['aAddress'], ",")."]";
                                 /*if (sizeof($aSearch['aAddressNonSearch'])) {
diff --git a/website/reverse.php b/website/reverse.php
index 9c9b99fb..56b80a5c 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -101,4 +101,3 @@ if ($sOutputFormat=='html') {
     $sTileAttribution = CONST_Map_Tile_Attribution;
 }
 include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
->>>>>>> upstream/master