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

5b0db121 · Ivan Chepurnyi · b7e7064c · cfe7c7f5 · 5b0db121
Commit 5b0db121 authored Aug 30, 2012 by Ivan Chepurnyi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/code/community/EcomDev/PHPUnit/Model/Layout.php app/code/community/EcomDev/PHPUnit/Model/Layout.php +1 -1

No files found.
--- a/app/code/community/EcomDev/PHPUnit/Model/Layout.php
+++ b/app/code/community/EcomDev/PHPUnit/Model/Layout.php
@@ -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'])) {