From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 24 Feb 2013 22:07:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~636
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4496d10c9fd25c0b2396edc8e4f124840361dea1?hp=ccdce35322a605e6665adbb32a804ef7476ac6fd

Merge remote-tracking branch 'upstream/master'
---

diff --git a/module/Makefile.in b/module/Makefile.in
index 0bfa62cc..fcaa41fa 100644
--- 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 dc7cc1b6..5f0cc512 160000
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit dc7cc1b6725958f09afb32379a3d937df75cdd70
+Subproject commit 5f0cc512e6fe192fc1c4754eed77b142663e38de
diff --git a/website/search.php b/website/search.php
index 6319a835..a6e94f5e 100755
--- 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);