Bug 1035400 - 'restart to update' button not working. r=rstrong, a=sledru
authorHector Zhao <bzhao@mozilla.com>
Thu, 22 Jan 2015 11:03:45 -0800
changeset 242991 8a2a86c11f7c
parent 242990 ba67c22c1427
child 242992 e8effa80da5b
push id4356
push userrstrong@mozilla.com
push date2015-01-22 19:03 +0000
treeherdermozilla-beta@8a2a86c11f7c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, sledru
bugs1035400
milestone36.0
Bug 1035400 - 'restart to update' button not working. r=rstrong, a=sledru
browser/base/content/aboutDialog.js
toolkit/mozapps/update/nsUpdateService.js
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -485,17 +485,17 @@ appUpdater.prototype =
       return;
 
     if (this.addons.length == 0) {
       // Compatibility updates or new version updates were found for all add-ons
       this.startDownload();
       return;
     }
 
-    this.selectPanel("apply");
+    this.selectPanel("applyBillboard");
   },
 
   /**
    * Starts the download of an update mar.
    */
   startDownload: function() {
     if (!this.update)
       this.update = this.um.activeUpdate;
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -3012,18 +3012,18 @@ UpdateService.prototype = {
       return;
 
     // If the new version of this add-on is blocklisted for the new application
     // then it isn't a valid update and the user should still be warned that
     // the add-on will become incompatible.
     let bs = Cc["@mozilla.org/extensions/blocklist;1"].
              getService(Ci.nsIBlocklistService);
     if (bs.isAddonBlocklisted(addon,
-                              gUpdates.update.appVersion,
-                              gUpdates.update.platformVersion))
+                              this._update.appVersion,
+                              this._update.platformVersion))
       return;
 
     // Compatibility or new version updates mean the same thing here.
     this.onCompatibilityUpdateAvailable(addon);
   },
 
   onUpdateFinished: function(addon) {
     if (--this._updateCheckCount > 0)