From 6c18bc9e4b13487cc503ff5a8b0d2a80f50ab9b6 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya Date: Tue, 3 May 2016 16:12:32 -0700 Subject: [PATCH] Bug 1267514 - Fix about:neterror generic fallback text when there is no available title/description for the error. r=Gijs MozReview-Commit-ID: 4no91xMhDYQ --HG-- extra : rebase_source : 6305595154f7642906798de82dc490243157b51e --- browser/base/content/aboutNetError.xhtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml index 40a43dabeae3..a36454077a99 100644 --- a/browser/base/content/aboutNetError.xhtml +++ b/browser/base/content/aboutNetError.xhtml @@ -217,15 +217,15 @@ // if it's an unknown error or there's no title or description // defined, get the generic message - var errTitle = document.getElementById("et_" + err).innerHTML; - var errDesc = document.getElementById("ed_" + err).innerHTML; + var errTitle = document.getElementById("et_" + err); + var errDesc = document.getElementById("ed_" + err); if (!errTitle || !errDesc) { - errTitle = document.getElementById("et_generic").innerHTML; - errDesc = document.getElementById("ed_generic").innerHTML; + errTitle = document.getElementById("et_generic"); + errDesc = document.getElementById("ed_generic"); } - document.querySelector(".title-text").innerHTML = errTitle; + document.querySelector(".title-text").innerHTML = errTitle.innerHTML; var sd = document.getElementById("errorShortDescText"); if (sd) { @@ -244,7 +244,7 @@ var ld = document.getElementById("errorLongDesc"); if (ld) { - ld.innerHTML = errDesc; + ld.innerHTML = errDesc.innerHTML; } if (err == "sslv3Used") {