MAGETWO-70796: MAGETWO-59282: Corrected previous fix to this ticket. #6990

 - Merge Pull Request #6990 from wardcapp/magento2:wardcapp-patch-MAGETWO-59282
 - Merged commits:
   1. c226707
   2. 6b11350
   3. 9522319

Author: Oleksii Korshenko

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php

@@ -82,18 +82,18 @@ public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $productIds = $collection->getAllIds();
-        $storeId = (int) $this->getRequest()->getParam('store', 0);
+        $requestStoreId = $storeId = $this->getRequest()->getParam('store', null);
+        $filterRequest = $this->getRequest()->getParam('filters', null);
         $status = (int) $this->getRequest()->getParam('status');
-        $filters = (array)$this->getRequest()->getParam('filters', []);
 
-        if (isset($filters['store_id'])) {
-            $storeId = (int)$filters['store_id'];
+        if (null !== $storeId && null !== $filterRequest) {
+            $storeId = (isset($filterRequest['store_id'])) ? (int) $filterRequest['store_id'] : 0;
         }
 
         try {
             $this->_validateMassStatus($productIds, $status);
             $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
-                ->updateAttributes($productIds, ['status' => $status], $storeId);
+                ->updateAttributes($productIds, ['status' => $status], (int) $storeId);
             $this->messageManager->addSuccess(__('A total of %1 record(s) have been updated.', count($productIds)));
             $this->_productPriceIndexerProcessor->reindexList($productIds);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -104,6 +104,6 @@ public function execute()
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        return $resultRedirect->setPath('catalog/*/', ['store' => $storeId]);
+        return $resultRedirect->setPath('catalog/*/', ['store' => $requestStoreId]);
     }
 }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php

@@ -123,7 +123,7 @@ protected function setUp()
 
     public function testMassStatusAction()
     {
-        $storeId = 1;
+        $storeId = 2;
         $status = \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED;
         $filters = [
             'store_id' => 2,
@@ -138,7 +138,7 @@ public function testMassStatusAction()
         $this->request->expects($this->exactly(3))
             ->method('getParam')
             ->willReturnMap([
-                ['store', 0, $storeId],
+                ['store', null, $storeId],
                 ['status', null, $status],
                 ['filters', [], $filters]
             ]);