Merge branch 'master' into 7.x

keithbrink · May 7, 2020 · f84a33e · f84a33e
2 parents 0973ee7 + b110986
commit f84a33e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/AmazonOrderList.php b/src/AmazonOrderList.php
@@ -58,6 +58,7 @@ public function __construct($s, $mock = false, $m = null)
 
         $config_options = $this->getOptions();
         $this->options['MarketplaceId.Id.1'] = $config_options['MarketplaceId'];
+        unset($this->options['marketplaceId']);
 
         if (isset($THROTTLE_LIMIT_ORDERLIST)) {
             $this->throttleLimit = $THROTTLE_LIMIT_ORDERLIST;
@@ -78,7 +79,6 @@ public function setConfig($config)
         parent::setConfig($config);
 
         $this->options['MarketplaceId.Id.1'] = $config['marketplaceId'];
-        unset($this->options['marketplaceId']);
     }
 
     /**