summaryrefslogtreecommitdiffstats
path: root/dom/encoding
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-09 19:46:05 +0200
committerGitHub <noreply@github.com>2018-05-09 19:46:05 +0200
commit21c5dd667220bf55dfb91b01bc37c2a239671f72 (patch)
tree8c7451dafa82b2ba2f1d20c9c306c2d836c90787 /dom/encoding
parentaa662adcfc086965ee9ecdcf4d2c01a1c4869efa (diff)
parent7c2dd4fed5b90f11af7cf5c20011a5c3fb3a5193 (diff)
downloadUXP-21c5dd667220bf55dfb91b01bc37c2a239671f72.tar
UXP-21c5dd667220bf55dfb91b01bc37c2a239671f72.tar.gz
UXP-21c5dd667220bf55dfb91b01bc37c2a239671f72.tar.lz
UXP-21c5dd667220bf55dfb91b01bc37c2a239671f72.tar.xz
UXP-21c5dd667220bf55dfb91b01bc37c2a239671f72.zip
Merge pull request #340 from janekptacijarabaci/preferences_fonts_fallback-character-encoding_1
Add UTF-8 as a default fallback encoding for unknown encodings
Diffstat (limited to 'dom/encoding')
-rw-r--r--dom/encoding/FallbackEncoding.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/dom/encoding/FallbackEncoding.cpp b/dom/encoding/FallbackEncoding.cpp
index 93fe0f8cb..29411412e 100644
--- a/dom/encoding/FallbackEncoding.cpp
+++ b/dom/encoding/FallbackEncoding.cpp
@@ -55,8 +55,7 @@ FallbackEncoding::Get(nsACString& aFallback)
// Don't let the user break things by setting the override to unreasonable
// values via about:config
if (!EncodingUtils::FindEncodingForLabel(override, mFallback) ||
- !EncodingUtils::IsAsciiCompatible(mFallback) ||
- mFallback.EqualsLiteral("UTF-8")) {
+ !EncodingUtils::IsAsciiCompatible(mFallback)) {
mFallback.Truncate();
}