Bug 1200263 - Fixes getReportURL function so Help -> Report Web Forgery works again r=Ratty a=IanN DONTBUILD for comm-esr45 CLOSED TREE THUNDERBIRD452b1_2016051723_RELBRANCH
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Tue, 23 Feb 2016 23:56:34 +0800
branchTHUNDERBIRD452b1_2016051723_RELBRANCH
changeset 24581 390c834aaaa0b80aed625d741cc27b3561ebbe7b
parent 24580 4cc0737d05db7722a58735c1a929dc1c12d9561d
child 24582 0914524726fc235db4c83dcbb4b369ebd6b65a97
push id1641
push userkent@caspia.com
push dateWed, 18 May 2016 07:34:32 +0000
treeherdercomm-beta@3d73a3597a7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, IanN
bugs1200263
Bug 1200263 - Fixes getReportURL function so Help -> Report Web Forgery works again r=Ratty a=IanN DONTBUILD for comm-esr45 CLOSED TREE
suite/browser/safeBrowsingOverlay.js
--- a/suite/browser/safeBrowsingOverlay.js
+++ b/suite/browser/safeBrowsingOverlay.js
@@ -20,31 +20,22 @@ var gSafeBrowsing = {
       broadcaster.removeAttribute("disabled");
     else
       broadcaster.setAttribute("disabled", true);
   },
 
   /**
    * Used to report a phishing page or a false positive
    * @param   aName
-   *          A String One of "Phish", "Error", "Malware" or "MalwareError".
+   *          A String One of "Phish", "PhishMistake" or "MalwareMistake".
    * @returns A String containing the report phishing URL.
    */
   getReportURL: function getReportURL(aName) {
-    var reportUrl = SafeBrowsing.getReportURL(aName);
-
     var pageUri = getBrowser().currentURI.cloneIgnoringRef();
-
-    // Remove the query to avoid including potentially sensitive data
-    if (pageUri instanceof Components.interfaces.nsIURL)
-      pageUri.query = "";
-
-    reportUrl += "&url=" + encodeURIComponent(pageUri.asciiSpec);
-
-    return reportUrl;
+    return SafeBrowsing.getReportURL(aName, pageUri);
   },
 
   initOverlay: function initOverlay(aEvent) {
     var popup = document.getElementById("helpPopup");
     popup.addEventListener("popupshowing", gSafeBrowsing.initMenuItems, false);
   }
 }