Skip to content

E
EcomDev_PHPUnit

We will be off on April 7th (Monday) for public holiday in our country

Commit 5b0db121 authored by Ivan Chepurnyi's avatar Ivan Chepurnyi
Browse files
Options

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

parents b7e7064c cfe7c7f5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/code/community/EcomDev/PHPUnit/Model/Layout.php
View file @ 5b0db121
......@@ -362,7 +362,7 @@ class EcomDev_PHPUnit_Model_Layout
{
$this->_collectedBlock = null;
parent::_generateBlock($node, $parent);
if ($this->_collectedBlock !== null) {
if ($this->_collectedBlock) {
$target = $this->_collectedBlock->getNameInLayout();
$params = array();
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