Activate marketplace plugin by default unless marketplace was disabled

1 files changed, 13 insertions, 6 deletions

diff --git a/core/Updates/3.0.0-b3.php b/core/Updates/3.0.0-b3.php
index 898f669eeb..01fc34e79b 100644
--- a/core/Updates/3.0.0-b3.php
+++ b/core/Updates/3.0.0-b3.php
@@ -35,13 +35,10 @@ class Updates_3_0_0_b3 extends Updates
             $this->removeOldMarketplaceEnabledConfig();
 
             if ($isMarketplaceEnabled) {
-                $pluginManager = Plugin\Manager::getInstance();
-                $pluginName = 'Marketplace';
-
-                if (!$pluginManager->isPluginActivated($pluginName)) {
-                    $pluginManager->activatePlugin($pluginName);
-                }
+                $this->activateMarketplacePlugin();
             }
+        } else {
+            $this->activateMarketplacePlugin();
         }
     }
 
@@ -62,4 +59,14 @@ class Updates_3_0_0_b3 extends Updates
             $config->forceSave();
         }
     }
+
+    public function activateMarketplacePlugin()
+    {
+        $pluginManager = Plugin\Manager::getInstance();
+        $pluginName = 'Marketplace';
+
+        if (!$pluginManager->isPluginActivated($pluginName)) {
+            $pluginManager->activatePlugin($pluginName);
+        }
+    }
 }