diff options
| author |  Hoa V. Dinh <dinh.viet.hoa@gmail.com> | 2014-12-19 15:10:12 -0800 |
|---|---|---|
| committer | Hoa V. Dinh <dinh.viet.hoa@gmail.com> | 2014-12-19 15:10:12 -0800 |
| commit | 9f3676443be574900afbda02f877887ade2aa043 (patch) | |
| tree | 3da2c2e8325871bfd3d53f62aa0fb348c7353fe1 /src | |
| parent | 3dfb8a6907c66698700cfaf279d4f94e7cd0f21e (diff) | |
Fix for test message referred in #1009, added corresponding unit test
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/basetypes/MCData.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/basetypes/MCData.cpp b/src/core/basetypes/MCData.cpp index 008cb7f0..1fbca6b4 100644 --- a/src/core/basetypes/MCData.cpp +++ b/src/core/basetypes/MCData.cpp @@ -474,6 +474,11 @@ String * Data::charsetWithFilteredHTML(bool filterHTML, String * hintCharset) result = hintCharset; } + if (result->lowercaseString()->isEqual(MCSTR("x-mac-cyrillic")) && + hintCharset->lowercaseString()->isEqual(MCSTR("windows-1251"))) { + result = MCSTR("windows-1251"); + } + return result; #endif } |