Fixup for bug 927174 - use the preexisting app.support.baseURL pref instead of a custom one
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 21 Oct 2013 10:33:49 -0400
changeset 165364 9faa8e2237db9e5275f5015126120f33ddc760f2
parent 165363 e3d6e17ad7a3d8687bd05cc041ef1e80ee154478
child 165365 177bf37a49f5b55eb00f2ce6d295fdc6b56cdb76
child 165366 df6f7d68a3d2d34082b6d134e068e25bb1b560ee
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs927174
milestone27.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
Fixup for bug 927174 - use the preexisting app.support.baseURL pref instead of a custom one
browser/app/profile/firefox.js
browser/base/content/browser-plugins.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -670,18 +670,16 @@ pref("pfs.datasource.url", "https://pfs.
 pref("plugins.hide_infobar_for_blocked_plugin", false);
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 
 pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
 pref("plugins.update.notifyUser", false);
 
 pref("plugins.click_to_play", true);
 
-pref("plugins.clickToActivateInfo.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/clicktoplay");
-
 // let all plugins except Flash default to click-to-play
 pref("plugin.default.state", 1);
 pref("plugin.state.flash", 2);
 
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 
 #ifdef XP_WIN
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -700,17 +700,17 @@ var gPluginHandler = {
       // TODO: allow the blocklist to specify a better link, bug 873093
       if (pluginInfo.blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE) {
         url = Services.urlFormatter.formatURLPref("plugins.update.url");
       }
       else if (pluginInfo.blocklistState != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
         url = Services.blocklist.getPluginBlocklistURL(pluginInfo.pluginTag);
       }
       else {
-        url = Services.urlFormatter.formatURLPref("plugins.clickToActivateInfo.url");
+        url = Services.urlFormatter.formatURLPref("app.support.baseURL") + "clicktoplay";
       }
       pluginInfo.detailsLink = url;
 
       centerActions.push(pluginInfo);
     }
 
     if (centerActions.length == 0) {
       // TODO: this is a temporary band-aid to avoid broken doorhangers