From 17123468803e9c8073beece7b181a68458f2559e Mon Sep 17 00:00:00 2001 From: "sspitzer%mozilla.org" Date: Mon, 4 Sep 2006 20:00:16 +0000 Subject: [PATCH] fix for bug #350636: the "never" hidden pref should only apply for major updates. r=rstrong, a=mconnor git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@209142 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in b/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in index 35331abc8a8..6c27a5871c1 100644 --- a/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in +++ b/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in @@ -1362,9 +1362,13 @@ UpdateService.prototype = { // but in selectUpdate(), minor updates trump major updates // if major trumps minor, and we said "never" to the major // we'd never see the minor update. + // + // note, the never decision should only apply to major updates + // see bug #350636 for a scenario where this could potentially + // be an issue var neverPrefName = PREF_UPDATE_NEVER_BRANCH + update.version; var never = getPref("getBoolPref", neverPrefName, false); - if (never) + if (never && update.type == "major") return; if (this._shouldPrompt(update))