зеркало из https://github.com/mozilla/gecko-dev.git
Fix for bug 58532. Need to catch error thrown by the function unescape. R=sspitzer, SR=mscott
This commit is contained in:
Родитель
b238fa4ec4
Коммит
f11fbfacfc
|
@ -530,7 +530,9 @@ function GetArgs()
|
|||
if (argvalue.charAt(0) == "'" && argvalue.charAt(argvalue.length - 1) == "'")
|
||||
args[argname] = argvalue.substring(1, argvalue.length - 1);
|
||||
else
|
||||
try {
|
||||
args[argname] = unescape(argvalue);
|
||||
} catch (e) {args[argname] = argvalue;}
|
||||
dump("[" + argname + "=" + args[argname] + "]\n");
|
||||
}
|
||||
return args;
|
||||
|
@ -664,9 +666,15 @@ function ComposeStartup()
|
|||
if (args.bodyislink == "true")
|
||||
{
|
||||
if (msgCompose.composeHTML)
|
||||
{
|
||||
var cleanBody;
|
||||
try {
|
||||
cleanBody = unescape(args.body);
|
||||
} catch(e) { cleanBody = args.body;}
|
||||
|
||||
msgCompFields.SetBody("<BR><A HREF=\"" + args.body +
|
||||
"\">" + unescape(args.body)
|
||||
+ "</A><BR>");
|
||||
"\">" + cleanBody + "</A><BR>");
|
||||
}
|
||||
else
|
||||
msgCompFields.SetBody("\n<" + args.body + ">\n");
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче