hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-09-06 09:28:57 +02:00
Code Issues Releases Wiki Activity

Fix code for PHP 5.3

Browse Source
This commit is contained in:
Jakub Turek
2015-05-19 17:20:15 +02:00
parent 7f0cab1a38
commit 9bb17413d2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Task/AbstractTask.php
+6 -6
View File
@@ -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'])) {