Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / ParameterParser.php

diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php
index 90e0cee317d8c1b0155f25c88248f80069288649..070be36c24a3856448ef3de965298690001dac33 100644 (file)
--- a/lib-php/ParameterParser.php
+++ b/lib-php/ParameterParser.php
@@ -70,7 +70,7 @@ class ParameterParser
             return $sDefault;
         }
 
             return $sDefault;
         }
 

-        if (!in_array($this->aParams[$sName], $aValues)) {
+        if (!in_array($this->aParams[$sName], $aValues, true)) {

             userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
         }
 
             userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
         }
 


@@ -114,11 +114,10 @@ class ParameterParser
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {

-            $this->addNameTag($aLangPrefOrder, $sLanguage);
+            $this->addNameTag($aLangPrefOrder, 'name:'.$sLanguage);

         }
         }

-        $this->addNameTag($aLangPrefOrder, 'default');
+        $this->addNameTag($aLangPrefOrder, 'name');

         $this->addNameTag($aLangPrefOrder, 'brand');
         $this->addNameTag($aLangPrefOrder, 'brand');

-

         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
             $this->addNameTag($aLangPrefOrder, 'official_name:'.$sLanguage);
             $this->addNameTag($aLangPrefOrder, 'short_name:'.$sLanguage);
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
             $this->addNameTag($aLangPrefOrder, 'official_name:'.$sLanguage);
             $this->addNameTag($aLangPrefOrder, 'short_name:'.$sLanguage);