diff --git a/src/browser/package-migration-manager.es6 b/src/browser/package-migration-manager.es6 index 279da6deb..0a39ab8d3 100644 --- a/src/browser/package-migration-manager.es6 +++ b/src/browser/package-migration-manager.es6 @@ -78,9 +78,12 @@ class PackageMigrationManager { // If the old install was enabled, keep it that way if (oldEnabledPackNames.includes(migration['old-name'])) { return } // If we want to enable the package by default, - if (migration['enabled-by-default']) { return } - const newName = migration['new-name'] - this.config.pushAtKeyPath('core.disabledPackages', newName); + if (migration['enabled-by-default']) { + this.config.set('core.disabledPackages', disabledPackNames.filter(n => n !== migration['new-name'])) + } else { + const newName = migration['new-name'] + this.config.pushAtKeyPath('core.disabledPackages', newName); + } }) this.config.set('core.packageMigrationVersion', this.version) diff --git a/src/package-manager.coffee b/src/package-manager.coffee index a4c07e833..6fa86678b 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -99,6 +99,7 @@ class PackageManager _notifyPluginsChanged: (nameData, dir) => names = _.pluck(nameData, "displayName") messages = _.compact(_.pluck(nameData, "message")).map((m) => decodeURIComponent(m)) + msgText = "" if messages.length > 0 msgText = "\n\n" + messages.join("\n\n") if names.length >= 2 diff --git a/src/pro b/src/pro index de9d2e927..0e0f53dda 160000 --- a/src/pro +++ b/src/pro @@ -1 +1 @@ -Subproject commit de9d2e927d23a1261e297785a755c2b172fd43fb +Subproject commit 0e0f53dda987bad661a9b1ea0a3eb6ade39f0ee9