summaryrefslogtreecommitdiffstats
path: root/browser/base/content
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-05 12:41:16 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-05 12:41:16 +0100
commit2d652d1c355c8bdde03a6c278b5b7b444424e394 (patch)
tree0ea18eabc7d3cdec78e59701e10e15a662af6641 /browser/base/content
parent2782832f265a8e0a7923ca885b431907cde7cc49 (diff)
parente8417003899a4ec9274815be30352c1328fc32e9 (diff)
downloadUXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar
UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.gz
UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.lz
UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.xz
UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.zip
Merge branch 'master' into ported-upstream
Diffstat (limited to 'browser/base/content')
-rw-r--r--browser/base/content/aboutDialog.js4
-rw-r--r--browser/base/content/aboutDialog.xul2
2 files changed, 5 insertions, 1 deletions
diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
index 569a65adb..b024d2d52 100644
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -62,6 +62,10 @@ function init(aEvent)
let arch = bundle.GetStringFromName(archResource);
versionField.textContent += ` (${arch})`;
+ // Get Release Notes URL from Preferences
+ let releaseNotesURL = Services.prefs.getCharPref("app.releaseNotesURL");
+ document.getElementById("releasenotes").setAttribute("href", releaseNotesURL);
+
if (AppConstants.MOZ_UPDATER) {
gAppUpdater = new appUpdater();
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index cbb07a5e1..ef2804f31 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -47,7 +47,7 @@
<hbox align="baseline">
#expand <label id="version">__MOZ_APP_VERSION_DISPLAY__</label>
#ifndef NIGHTLY_BUILD
-#expand <label id="releasenotes" class="text-link" href="https://www.mozilla.org/firefox/__MOZ_APP_VERSION__/releasenotes/">&releaseNotes.link;</label>
+ <label id="releasenotes" class="text-link">&releaseNotes.link;</label>
#endif
</hbox>