From f99e449baadebc52a763cc5930fe73bfb5700dda Mon Sep 17 00:00:00 2001
From: Jared Hirsch <ohai@6a68.net>
Date: Tue, 23 Jan 2018 17:56:21 -0800
Subject: [PATCH] Fix #3996, disable uploads for ESR

---
 addon/bootstrap.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/bootstrap.js b/addon/bootstrap.js
index 9d27250dd6..0fa2fa3547 100644
--- a/addon/bootstrap.js
+++ b/addon/bootstrap.js
@@ -215,8 +215,9 @@ function handleMessage(msg, sender, sendReply) {
     let telemetryEnabled = getBoolPref(TELEMETRY_ENABLED_PREF);
     sendReply({type: "success", value: telemetryEnabled});
   } else if (msg.funcName === "isUploadDisabled") {
+    let isESR = AppConstants.MOZ_UPDATE_CHANNEL === 'esr';
     let uploadDisabled = getBoolPref(UPLOAD_DISABLED_PREF);
-    sendReply({type: "success", value: uploadDisabled});
+    sendReply({type: "success", value: uploadDisabled || isESR});
   } else if (msg.funcName === "getOldDeviceInfo") {
     let oldDeviceInfo = prefs.prefHasUserValue(OLD_ADDON_PREF_NAME) && prefs.getCharPref(OLD_ADDON_PREF_NAME);
     sendReply({type: "success", value: oldDeviceInfo || null});