fix merge error

diff --git a/lib/Geocode.php b/lib/Geocode.php
index b6458725bdab22fd3ccd42e0dac28d67533c43f4..692f4093c2fd259ae701dc8da67982876255fd74 100644 (file)
--- 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 9c9b99fbdcd479e752b24c1770b4284c400cec6f..56b80a5c0b001a7585f6111032574fe2d52b9472 100755 (executable)
--- 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