X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6be2077d922098d65f069557dea55542c15a5c98..7cafec07504a9350bdfc8d8089029bf7a68b6dca:/lib-php/ParameterParser.php?ds=sidebyside diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php index 90e0cee3..070be36c 100644 --- a/lib-php/ParameterParser.php +++ b/lib-php/ParameterParser.php @@ -70,7 +70,7 @@ class ParameterParser 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)); } @@ -114,11 +114,10 @@ class ParameterParser } 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'); - foreach ($aLanguages as $sLanguage => $fLanguagePref) { $this->addNameTag($aLangPrefOrder, 'official_name:'.$sLanguage); $this->addNameTag($aLangPrefOrder, 'short_name:'.$sLanguage);