Bug 1401137 - Updated hard-coded SUMO link to the safe browsing page. r=johannh draft bug_1401137
authorVedant Chakravadhanula <vedantc98@gmail.com>
Fri, 13 Oct 2017 19:22:22 +0530
branchbug_1401137
changeset 685251 bc73ff0d7ad8
parent 680024 196dadb2fe50
child 737098 4dfbdf0ce01b
push id85876
push userbmo:vedantc98@gmail.com
push dateTue, 24 Oct 2017 09:04:50 +0000
reviewersjohannh
bugs1401137, 1363051, 1359289
milestone58.0a1
Bug 1401137 - Updated hard-coded SUMO link to the safe browsing page. r=johannh The link to the phishin-malware support site was hard-coded in bug 1363051 and bug 1359289. The links have been built through the urlFormatter. MozReview-Commit-ID: FmKGcEM4GZd
browser/base/content/content.js
browser/components/preferences/in-content/privacy.js
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -195,17 +195,17 @@ var AboutBlockedSiteListener = {
           "https://safebrowsing.google.com/safebrowsing/report_error/?tpl=mozilla");
         doc.getElementById("learn_more_link").setAttribute("href",
           "https://www.antiphishing.org//");
         break;
     }
 
     // Set the firefox support url.
     doc.getElementById("firefox_support").setAttribute("href",
-      "https://support.mozilla.org/kb/how-does-phishing-and-malware-protection-work");
+      Services.urlFormatter.formatURLPref("app.support.baseURL") + "phishing-malware");
 
     // Set safe browsing advisory link.
     let advisoryUrl = Services.prefs.getCharPref(
       "browser.safebrowsing.provider." + provider + ".advisoryURL", "");
     if (!advisoryUrl) {
       let el = content.document.getElementById("advisoryDesc");
       el.remove();
       return;
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -1067,17 +1067,17 @@ var gPrivacyPane = {
 
     let blockDownloadsPref = document.getElementById("browser.safebrowsing.downloads.enabled");
     let malwareTable = document.getElementById("urlclassifier.malwareTable");
 
     let blockUnwantedPref = document.getElementById("browser.safebrowsing.downloads.remote.block_potentially_unwanted");
     let blockUncommonPref = document.getElementById("browser.safebrowsing.downloads.remote.block_uncommon");
 
     let learnMoreLink = document.getElementById("enableSafeBrowsingLearnMore");
-    let phishingUrl = "https://support.mozilla.org/kb/how-does-phishing-and-malware-protection-work";
+    let phishingUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "phishing-malware";
     learnMoreLink.setAttribute("href", phishingUrl);
 
     enableSafeBrowsing.addEventListener("command", function() {
       safeBrowsingPhishingPref.value = enableSafeBrowsing.checked;
       safeBrowsingMalwarePref.value = enableSafeBrowsing.checked;
 
       if (enableSafeBrowsing.checked) {
         if (blockDownloads) {