summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-09 19:46:00 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-09 19:46:00 +0200
commitb98c4ed80b389400df2792a49147d191e5bb9921 (patch)
treeed68b0530982a630ee5fe3a139e0b23463eb36a9 /dom
parentfd2b227f19844978021811e9e1a60b8bcbd1ecad (diff)
parent21c5dd667220bf55dfb91b01bc37c2a239671f72 (diff)
downloadUXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar.gz
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar.lz
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.tar.xz
UXP-b98c4ed80b389400df2792a49147d191e5bb9921.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'dom')
-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();
}