Browse Source

Fix code for PHP 5.3

1.0
Jakub Turek 10 years ago
parent
commit
9bb17413d2
  1. 12
      Mage/Task/AbstractTask.php

12
Mage/Task/AbstractTask.php

@ -318,12 +318,12 @@ abstract class AbstractTask
protected function getEnvVariables() protected function getEnvVariables()
{ {
$configVars = array_merge( $configVars = array_merge(
$this->getConfig()->general('env', []), $this->getConfig()->general('env', array()),
$this->getConfig()->environmentConfig('env', []), $this->getConfig()->environmentConfig('env', array()),
$this->getConfig()->getParameter('env', []), $this->getConfig()->getParameter('env', array()),
[ array(
'variables' => $this->getConfig()->getParameter('env.variables', []) 'variables' => $this->getConfig()->getParameter('env.variables', array())
] )
); );
if (isset($configVars['variables'])) { if (isset($configVars['variables'])) {

Loading…
Cancel
Save