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

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

mozilla/content/base/src/nsScriptLoader.cpp

@@ -691,6 +691,11 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader,
 
     NS_ASSERTION(NS_SUCCEEDED(rv), "Could not get document charset!");
 
+    if (characterSet.IsEmpty()) {
+      // fall back to ISO-8851-1, see bug 118404
+      characterSet = NS_LITERAL_STRING("ISO-8859-1");
+    }
+    
     nsCOMPtr<nsICharsetConverterManager> charsetConv =
       do_GetService(kCharsetConverterManagerCID, &rv);