Skip to content
Snippets Groups Projects
Unverified Commit 372a9a63 authored by Peter Rotich's avatar Peter Rotich Committed by GitHub
Browse files

Merge pull request #4932 from JediKev/issue/iso-8859-8-i-charset-issues

issue: ISO-8859-8-i Charset Issues
parents e4cb4e98 4da0324b
Branches
Tags
No related merge requests found
...@@ -29,7 +29,8 @@ class Charset { ...@@ -29,7 +29,8 @@ class Charset {
// ks_c_5601-1987: Korean alias for cp949 // ks_c_5601-1987: Korean alias for cp949
case preg_match('`^ks_c_5601-1987`i', $charset): case preg_match('`^ks_c_5601-1987`i', $charset):
return 'cp949'; return 'cp949';
case preg_match('`^iso-?(\S+)$`i', $charset, $match): // Remove trailing junk from ISO charset
case preg_match('`^iso-?(\S+[^i])(-i)?$`i', $charset, $match):
return "ISO-".$match[1]; return "ISO-".$match[1];
// GBK superceded gb2312 and is backward compatible // GBK superceded gb2312 and is backward compatible
case preg_match('`^gb2312`i', $charset): case preg_match('`^gb2312`i', $charset):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment