Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't let an empty intl.charset.default pref set the document charset to

Browse Source 
the empty string.  Fall back to ISO-8859-1 in the script loader if there
is no other charset set.  Bug 118404, r=harishd, sr=jst


git-svn-id: svn://10.0.0.236/trunk@113444 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2002-02-01 21:36:00 +00:00
parent efa43449be
commit bcc31f85dd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -679,11 +679,11 @@ nsHTMLDocument::TryWeakDocTypeDefault(PRInt32& aCharsetSource,
if (prefs) {
nsXPIDLString defCharset;
nsresult rv = prefs->GetLocalizedUnicharPref("intl.charset.default", getter_Copies(defCharset));
if (NS_SUCCEEDED(rv)) {
if (NS_SUCCEEDED(rv) && !defCharset.IsEmpty()) {
aCharset.Assign(defCharset);
aCharsetSource = kCharsetFromWeakDocTypeDefault;
}
}
aCharsetSource = kCharsetFromWeakDocTypeDefault;
return PR_TRUE;
}