enable_marketplace should be set specifically to 0 (if it's null then we consider marketplace is enabled)2.17.0-b3

fixes  https://github.com/piwik/piwik/issues/10778

2 files changed, 5 insertions, 4 deletions

diff --git a/core/Updates/2.17.0-b2.php b/core/Updates/2.17.0-b3.php
index 8eb5a4e7a4..c9e1c58db4 100644
--- a/core/Updates/2.17.0-b2.php
+++ b/core/Updates/2.17.0-b3.php
@@ -15,16 +15,17 @@ use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
 
 /**
- * Update for version 2.16.1-b2.
  */
-class Updates_2_17_0_b2 extends PiwikUpdates
+class Updates_2_17_0_b3 extends PiwikUpdates
 {
     private $marketplaceEnabledConfigSetting = 'enable_marketplace';
 
     public function doUpdate(Updater $updater)
     {
         $general = $this->getConfig()->General;
-        $isMarketplaceEnabled = !empty($general[$this->marketplaceEnabledConfigSetting]);
+
+        // need to check against int(0) value, as if the config setting is not set at all its value is null
+        $isMarketplaceEnabled = 0 !== $general[$this->marketplaceEnabledConfigSetting];
 
         $this->removeOldMarketplaceEnabledConfig();
 
diff --git a/core/Version.php b/core/Version.php
index 4024ac4d69..20b0e9ae0b 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -20,7 +20,7 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.17.0-b2';
+    const VERSION = '2.17.0-b3';
 
     public function isStableVersion($version)
     {