Merge branch 'MAGETWO-21160-disable-functions' into develop

Dale Sikkema · Dale Sikkema · commit 9bbf352c3f42 · 2015-05-05T08:58:53.000-05:00
diff --git a/lib/internal/Magento/Framework/Shell.php b/lib/internal/Magento/Framework/Shell.php
@@ -49,7 +49,7 @@ public function execute($command, array $arguments = [])
         $command = $this->commandRenderer->render($command, $arguments);
         $this->log($command);
 
-        $disabled = explode(',', ini_get('disable_functions'));
+        $disabled = explode(',', str_replace(' ', ',', ini_get('disable_functions')));
         if (in_array('exec', $disabled)) {
             throw new Exception\LocalizedException(new \Magento\Framework\Phrase("exec function is disabled."));
         }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function execute($command, array $arguments = [])`
`49`	`49`	`$command = $this->commandRenderer->render($command, $arguments);`
`50`	`50`	`$this->log($command);`
`51`	`51`
`52`		`- $disabled = explode(',', ini_get('disable_functions'));`
	`52`	`+ $disabled = explode(',', str_replace(' ', ',', ini_get('disable_functions')));`
`53`	`53`	`if (in_array('exec', $disabled)) {`
`54`	`54`	`throw new Exception\LocalizedException(new \Magento\Framework\Phrase("exec function is disabled."));`
`55`	`55`	`}`