Bug 1419042 - Only use the distroVersion if the pref contains a value, otherwise leave it out of the version string. r?evanxd
MozReview-Commit-ID: Pign2W4RfE
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -11,20 +11,25 @@ Components.utils.import("resource://gre/
Components.utils.import("resource://gre/modules/AppConstants.jsm");
function init(aEvent) {
if (aEvent.target != document)
return;
var distroId = Services.prefs.getCharPref("distribution.id", "");
if (distroId) {
- var distroVersion = Services.prefs.getCharPref("distribution.version");
+ var distroString = distroId;
+
+ var distroVersion = Services.prefs.getCharPref("distribution.version", "");
+ if (distroVersion) {
+ distroString += " - " + distroVersion;
+ }
var distroIdField = document.getElementById("distributionId");
- distroIdField.value = distroId + " - " + distroVersion;
+ distroIdField.value = distroString;
distroIdField.style.display = "block";
var distroAbout = Services.prefs.getStringPref("distribution.about", "");
if (distroAbout) {
var distroField = document.getElementById("distribution");
distroField.value = distroAbout;
distroField.style.display = "block";
}
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -354,20 +354,25 @@ var gMainPane = {
if (relNotesURL != "about:blank") {
relNotesLink.href = relNotesURL;
relNotesLink.hidden = false;
}
}
let distroId = Services.prefs.getCharPref("distribution.id", "");
if (distroId) {
- let distroVersion = Services.prefs.getCharPref("distribution.version");
+ let distroString = distroId;
+
+ let distroVersion = Services.prefs.getCharPref("distribution.version", "");
+ if (distroVersion) {
+ distroString += " - " + distroVersion;
+ }
let distroIdField = document.getElementById("distributionId");
- distroIdField.value = distroId + " - " + distroVersion;
+ distroIdField.value = distroString;
distroIdField.hidden = false;
let distroAbout = Services.prefs.getStringPref("distribution.about", "");
if (distroAbout) {
let distroField = document.getElementById("distribution");
distroField.value = distroAbout;
distroField.hidden = false;
}