From 7a76ef40d8349b3a2adc0152ef5f1e8d42b201a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Thu, 14 Jun 2018 10:37:09 -0400
Subject: [PATCH] HOR-4662

---
 workflow/engine/methods/enterprise/addonsStoreAction.php | 2 ++
 workflow/engine/methods/login/licenseUpdate.php          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index 0172149e2..1b97493aa 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -84,6 +84,8 @@ try {
                     foreach ($pluginRegistry->getAllPluginsDetails() as $plugin) {
                         if ($plugin->isEnabled() && !in_array($plugin->getNamespace(), $licenseManager->features)) {
                             $pluginRegistry->disablePlugin($plugin->getNamespace());
+                            // In order to keep the custom plugins state, it is required to set the attribute before saving the info
+                            $plugin->setEnabled(true);
                             $pluginRegistry->savePlugin($plugin->getNamespace());
                         }
                     }
diff --git a/workflow/engine/methods/login/licenseUpdate.php b/workflow/engine/methods/login/licenseUpdate.php
index c3b0cbe0c..5030a21cc 100644
--- a/workflow/engine/methods/login/licenseUpdate.php
+++ b/workflow/engine/methods/login/licenseUpdate.php
@@ -44,6 +44,8 @@ if ($aux['extension'] != 'dat') {
         foreach ($pluginRegistry->getAllPluginsDetails() as $plugin) {
             if ($plugin->isEnabled() && !in_array($plugin->getNamespace(), $licenseManager->features)) {
                 $pluginRegistry->disablePlugin($plugin->getNamespace());
+                // In order to keep the custom plugins state, it is required to set the attribute before saving the info
+                $plugin->setEnabled(true);
                 $pluginRegistry->savePlugin($plugin->getNamespace());
             }
         }