Fixing issue with regex catching all languages

theD1360 · theD1360 · commit 2615070d2d9f · 2015-08-23T17:17:58.000-05:00
diff --git a/i18n.class.php b/i18n.class.php
@@ -284,7 +284,7 @@ public function getUserLangs() {
     public static function parseLangCode($langCode, &$parentLangCode = null)
     {
         $langCode = strtolower($langCode);
-        if(preg_match("/([\w]{2}(\-[\w]{2})*)/i", $langCode, $matches)){
+        if(preg_match("/(([\w]{2})\-([\w]{2}))/i", $langCode, $matches)){
             $langCode = $matches[0];
             $parentLangCode = $matches[2];
         }else{

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ public function getUserLangs() {`
`284`	`284`	`public static function parseLangCode($langCode, &$parentLangCode = null)`
`285`	`285`	`{`
`286`	`286`	`$langCode = strtolower($langCode);`
`287`		`- if(preg_match("/([\w]{2}(\-[\w]{2})*)/i", $langCode, $matches)){`
	`287`	`+ if(preg_match("/(([\w]{2})\-([\w]{2}))/i", $langCode, $matches)){`
`288`	`288`	`$langCode = $matches[0];`
`289`	`289`	`$parentLangCode = $matches[2];`
`290`	`290`	`}else{`