From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Fri, 14 Dec 2012 20:48:33 +0000 (+0000)
Subject: Merge branch 'master' of github.com:twain47/Nominatim
X-Git-Tag: v2.2.0~158
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b86d5c6a42624708af4e57121caf5cc02241544f?hp=1965f423dc179fed8f0123eef2ea93b10c0b22e8

Merge branch 'master' of github.com:twain47/Nominatim
---

diff --git a/lib/lib.php b/lib/lib.php
index 07ef2f95..2c335c49 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -116,15 +116,17 @@
 		}
 
 		$aLanguages = array();
-		if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER))
-		{
-			foreach($aLanguagesParse as $iLang => $aLanguage)
+		if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+			if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER))
 			{
-				$aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
-				if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
+				foreach($aLanguagesParse as $iLang => $aLanguage)
+				{
+					$aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
+					if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
+				}
+				arsort($aLanguages);
 			}
-			arsort($aLanguages);
-		}
+        }
 		if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1);
 		foreach($aLanguages as $sLangauge => $fLangauagePref)
 		{
diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index c05bce29..0a1d074a 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -3,7 +3,7 @@
 
 	if (!sizeof($aPlace))
 	{
-		if ($sError)
+		if (isset($sError))
 			$aFilteredPlaces['error'] = $sError;
 		else
 			$aFilteredPlaces['error'] = 'Unable to geocode';
diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index 4e751a0d..00f8750d 100644
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -3,7 +3,7 @@
 
 	if (!sizeof($aPlace))
 	{
-		if ($sError)
+		if (isset($sError))
 			$aFilteredPlaces['error'] = $sError;
 		else
 			$aFilteredPlaces['error'] = 'Unable to geocode';
diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 75f69e15..fcd90b85 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -14,7 +14,7 @@
 
 	if (!sizeof($aPlace))
 	{
-		if ($sError)
+		if (isset($sError))
 			echo "<error>$sError</error>";
 		else
 			echo "<error>Unable to geocode</error>";
diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 671edde4..e1552a15 100644
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -40,7 +40,7 @@
 
 		$aPlace['category'] = $aPointDetails['class'];
 		$aPlace['type'] = $aPointDetails['type'];
-		if ($aPointDetails['icon'])
+		if (isset($aPointDetails['icon']))
 		{
 			$aPlace['icon'] = $aPointDetails['icon'];
 		}
diff --git a/sql/functions.sql b/sql/functions.sql
index 4c679f3b..aa2a8908 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1526,6 +1526,7 @@ BEGIN
 
         -- Merge address from parent
         nameaddress_vector := array_merge(nameaddress_vector, location.nameaddress_vector);
+        nameaddress_vector := array_merge(nameaddress_vector, location.name_vector);
 --return NEW;
         -- Performance, it would be more acurate to do all the rest of the import process but it takes too long
         -- Just be happy with inheriting from parent road only
diff --git a/website/search.php b/website/search.php
index a619ed78..5ba2571b 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1475,7 +1475,7 @@
 		logEnd($oDB, $hLog, sizeof($aToFilter));
 	}
  	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
-	$sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
+	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
 	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
 	if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
 	if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);