From 19449300c8adedade61968da069f1b5e206b0ecb Mon Sep 17 00:00:00 2001
From: YFdyh000 <yfdyh000@gmail.com>
Date: Wed, 30 Apr 2014 17:03:00 +0200
Subject: [PATCH] Bug 1001794 - ""Help, About" does not show proper update
 channel in 29rc updated on beta channel" r=gavin

---
 browser/base/content/aboutDialog.js  | 5 +++--
 browser/base/content/aboutDialog.xul | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
index 34b46619199..40d2c347506 100644
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -52,11 +52,12 @@ function init(aEvent)
 #ifdef MOZ_UPDATER
   gAppUpdater = new appUpdater();
 
-#if MOZ_UPDATE_CHANNEL != release
   let defaults = Services.prefs.getDefaultBranch("");
   let channelLabel = document.getElementById("currentChannel");
+  let currentChannelText = document.getElementById("currentChannelText");
   channelLabel.value = defaults.getCharPref("app.update.channel");
-#endif
+  if (channelLabel.value == "release")
+      currentChannelText.hidden = true;
 #endif
 
 #ifdef XP_MACOSX
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul
index fc23aab677c..5e5f07f46bc 100644
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -108,12 +108,10 @@
 #endif
           </vbox>
 
-#if MOZ_UPDATE_CHANNEL != release
 #ifdef MOZ_UPDATER
           <description class="text-blurb" id="currentChannelText">
             &channel.description.start;<label id="currentChannel"/>&channel.description.end;
           </description>
-#endif
 #endif
           <vbox id="experimental" hidden="true">
             <description class="text-blurb" id="warningDesc">