Merge branch 'MAGETWO-52000-impossible-2see' of github.corp.magento.com:magento-ogre/magento2ce into MAGETWO-52000-impossible-2see

ark99 · ark99 · commit c6f7ea092390 · 2016-05-13T22:51:21.000-05:00
diff --git a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
@@ -153,11 +153,13 @@ public function createUpdaterTasks(array $postPayload)
             }
         }
 
-        $errorMessage .= $this->updater->createUpdaterTask(
-            [],
-            \Magento\Setup\Model\Cron\JobFactory::JOB_ENABLE_CACHE,
-            [implode(' ', $enabledCaches)]
-        );
+        if (!empty($enabledCaches)) {
+            $errorMessage .= $this->updater->createUpdaterTask(
+                [],
+                \Magento\Setup\Model\Cron\JobFactory::JOB_ENABLE_CACHE,
+                [implode(' ', $enabledCaches)]
+            );
+        }
 
         return $errorMessage;
     }

Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,13 @@ public function createUpdaterTasks(array $postPayload)`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`- $errorMessage .= $this->updater->createUpdaterTask(`
`157`		`- [],`
`158`		`- \Magento\Setup\Model\Cron\JobFactory::JOB_ENABLE_CACHE,`
`159`		`- [implode(' ', $enabledCaches)]`
`160`		`- );`
	`156`	`+ if (!empty($enabledCaches)) {`
	`157`	`+ $errorMessage .= $this->updater->createUpdaterTask(`
	`158`	`+ [],`
	`159`	`+ \Magento\Setup\Model\Cron\JobFactory::JOB_ENABLE_CACHE,`
	`160`	`+ [implode(' ', $enabledCaches)]`
	`161`	`+ );`
	`162`	`+ }`
`161`	`163`
`162`	`164`	`return $errorMessage;`
`163`	`165`	`}`