Commit 5b0db121 authored by Ivan Chepurnyi's avatar Ivan Chepurnyi

Merge remote-tracking branch 'origin/master' into dev

parents b7e7064c cfe7c7f5
...@@ -362,7 +362,7 @@ class EcomDev_PHPUnit_Model_Layout ...@@ -362,7 +362,7 @@ class EcomDev_PHPUnit_Model_Layout
{ {
$this->_collectedBlock = null; $this->_collectedBlock = null;
parent::_generateBlock($node, $parent); parent::_generateBlock($node, $parent);
if ($this->_collectedBlock !== null) { if ($this->_collectedBlock) {
$target = $this->_collectedBlock->getNameInLayout(); $target = $this->_collectedBlock->getNameInLayout();
$params = array(); $params = array();
if (isset($node['as'])) { if (isset($node['as'])) {
......
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