Merge remote-tracking branch 'upstream/master'

diff --git a/module/Makefile.in b/module/Makefile.in
index 0bfa62cca2d41ef1dd2adb0bbd1907cfbb479405..fcaa41fac9a20944d4ff7e560013d914a448fb8e 100644 (file)
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -1,5 +1,6 @@
 MODULES = nominatim
 PGXS := @POSTGRESQL_PGXS@
+PG_CONFIG := @PG_CONFIG@
 include $(PGXS)
 
 all:

diff --git a/osm2pgsql b/osm2pgsql
index dc7cc1b6725958f09afb32379a3d937df75cdd70..5f0cc512e6fe192fc1c4754eed77b142663e38de 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit dc7cc1b6725958f09afb32379a3d937df75cdd70
+Subproject commit 5f0cc512e6fe192fc1c4754eed77b142663e38de

diff --git a/website/search.php b/website/search.php
index 6319a83502e778140942c673f1e69f8d4f0ee522..a6e94f5e2c807842ed981063577565649ae8811d 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -432,7 +432,7 @@
                                {
                                        $aValidTokens[$aToken['word_token']] = array($aToken);
                                }
-                               if ($aToken['word_token'][0]==' ' && !$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
+                               if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
                                $aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
                        }
                        if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);