Bug 1414979 - Add fallbacks for pocket disclaimer in Activity Stream r=dmose
authork88hudson <k88hudson@gmail.com>
Mon, 06 Nov 2017 18:09:49 -0500
changeset 390415 02ec5cb3384c4f2a5164f56b4286a7cc40d4d890
parent 390414 3a9662efa80c5763e146c2e9ea7e2570dd327e67
child 390416 c5417e806ad5241774950a58f320fa9451105b2b
push id32829
push userapavel@mozilla.com
push dateTue, 07 Nov 2017 10:28:12 +0000
treeherdermozilla-central@597025d8888f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmose
bugs1414979
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 1414979 - Add fallbacks for pocket disclaimer in Activity Stream r=dmose
browser/extensions/activity-stream/lib/SectionsManager.jsm
--- a/browser/extensions/activity-stream/lib/SectionsManager.jsm
+++ b/browser/extensions/activity-stream/lib/SectionsManager.jsm
@@ -29,17 +29,21 @@ const BUILT_IN_SECTIONS = {
       }] : []
     },
     shouldHidePref: options.hidden,
     eventSource: "TOP_STORIES",
     icon: options.provider_icon,
     title: {id: "header_recommended_by", values: {provider: options.provider_name}},
     disclaimer: {
       text: {id: options.disclaimer_text || "section_disclaimer_topstories"},
-      link: {href: options.disclaimer_link, id: options.disclaimer_linktext || "section_disclaimer_topstories_linktext"},
+      link: {
+        // The href fallback is temporary so users in existing Shield studies get this configuration as well
+        href: options.disclaimer_link || "https://getpocket.cdn.mozilla.net/firefox/new_tab_learn_more",
+        id: options.disclaimer_linktext || "section_disclaimer_topstories_linktext"
+      },
       button: {id: options.disclaimer_buttontext || "section_disclaimer_topstories_buttontext"}
     },
     maxRows: 1,
     availableContextMenuOptions: ["CheckBookmark", "SaveToPocket", "Separator", "OpenInNewWindow", "OpenInPrivateWindow", "Separator", "BlockUrl"],
     infoOption: {
       header: {id: options.provider_header || "pocket_feedback_header"},
       body: {id: options.provider_description || "pocket_feedback_body"},
       link: {href: options.info_link, id: "section_info_privacy_notice"}