From bb81d8d86f0fb6ee94939b880e4435702373f866 Mon Sep 17 00:00:00 2001
From: Michiel Gerritsen <michiel@controlaltdelete.nl>
Date: Wed, 14 Aug 2019 08:46:30 +0200
Subject: [PATCH] Check the active flag on every upgrade

---
 Setup/UpgradeData.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
index b33dcacefbe..16e42814f7d 100644
--- a/Setup/UpgradeData.php
+++ b/Setup/UpgradeData.php
@@ -91,14 +91,13 @@ public function upgrade(
             $this->removeBitcoinConfiguration();
         }
 
-        if (version_compare($context->getVersion(), '1.6.1', '<')) {
-            $this->upgradeActiveState();
-        }
-
         if (version_compare($context->getVersion(), '1.6.2', '<')) {
             $this->addIndexes($setup);
         }
 
+        // This should run every time
+        $this->upgradeActiveState();
+
         $setup->endSetup();
     }