Commit a8116f23 authored by Fabian Schmengler /'s avatar Fabian Schmengler / Committed by GitHub

Merge pull request #276 from schmengler/bugfix/php7compat

Integrate PHP 7 compatibility patch from Inchoo_PHP7 into EcomDev_PHP…
parents 35c08fbf 7e015df5
......@@ -532,6 +532,15 @@ class EcomDev_PHPUnit_Model_Layout
public function getOutput()
{
$this->record(self::ACTION_RENDER, 'layout');
return parent::getOutput();
// parent::getOutput() with Inchoo_PHP7 fix:
$out = '';
if (!empty($this->_output)) {
foreach ($this->_output as $callback) {
$out .= $this->getBlock($callback[0])->{$callback[1]}();
}
}
return $out;
}
}
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment