Bug 970337 - Switch Help->Submit feedback to use a product url. r=mak
authorMike Cooper <mcooper@mozilla.com>
Mon, 24 Feb 2014 09:57:30 -0500
changeset 170822 b237a3162787c24353a86ca461fcc75ec770c162
parent 170821 85739150d974ddfa70f18faa0afdf762aea64cf0
child 170823 0ed9572044c105c4f3562c7bbad048342bcfa15e
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmak
bugs970337
milestone30.0a1
Bug 970337 - Switch Help->Submit feedback to use a product url. r=mak
browser/app/profile/firefox.js
browser/base/content/utilityOverlay.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -947,16 +947,19 @@ pref("toolkit.crashreporter.pluginHangSu
 
 // URL for "Learn More" for Crash Reporter
 pref("toolkit.crashreporter.infoURL",
      "https://www.mozilla.org/legal/privacy/firefox.html#crash-reporter");
 
 // base URL for web-based support pages
 pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
 
+// base url for web-based feedback pages
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
+
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
 pref("security.alternate_certificate_error_page", "certerror");
 
 // Whether to start the private browsing mode at application startup
 pref("browser.privatebrowsing.autostart", false);
 
 // Don't try to alter this pref, it'll be reset the next time you use the
 // bookmarking dialog
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -554,17 +554,20 @@ function openHealthReport()
 }
 #endif
 
 /**
  * Opens the feedback page for this version of the application.
  */
 function openFeedbackPage()
 {
-  openUILinkIn("https://input.mozilla.org/feedback", "tab");
+  var url = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                      .getService(Components.interfaces.nsIURLFormatter)
+                      .formatURLPref("app.feedback.baseURL");
+  openUILinkIn(url, "tab");
 }
 
 function buildHelpMenu()
 {
   // Enable/disable the "Report Web Forgery" menu item.
   if (typeof gSafeBrowsing != "undefined")
     gSafeBrowsing.setReportPhishingMenu();
 }