From 2bc46b8f213defcb6b8c9624a5c4c1f3571ccdcc Mon Sep 17 00:00:00 2001 From: name Date: Sat, 17 Nov 2018 20:20:06 +0200 Subject: [PATCH] match languages such as ja_rm (or any other with underscore) properly --- lib/ParameterParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ParameterParser.php b/lib/ParameterParser.php index 26b648bb..ad281d70 100644 --- a/lib/ParameterParser.php +++ b/lib/ParameterParser.php @@ -91,7 +91,7 @@ class ParameterParser $sLangString = $this->getString('accept-language', $sFallback); if ($sLangString) { - if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) { + if (preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) { 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; -- 2.39.5