Bug 1401137 - Updated hard-coded SUMO link to the safe browsing page. r=johannh
authorVedant Chakravadhanula <vedantc98@gmail.com>
Fri, 13 Oct 2017 19:22:22 +0530
changeset 390304 daea037cd968
parent 390281 fb90190ba5b1
child 390305 25f6ee53ac1c
push id32827
push userccoroiu@mozilla.com
push dateMon, 06 Nov 2017 23:02:00 +0000
treeherdermozilla-central@62aeebcc676e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1401137, 1363051, 1359289
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
@@ -192,17 +192,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");
 
     // Show safe browsing details on load if the pref is set to true.
     let showDetails = Services.prefs.getBoolPref("browser.xul.error_pages.show_safe_browsing_details_on_load");
     if (showDetails) {
       let details = content.document.getElementById("errorDescriptionContainer");
       details.removeAttribute("hidden");
     }
 
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -1051,17 +1051,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) {