|
|
@@ -111,12 +111,12 @@ class ViewBlock
|
|
|
$mode = end($this->_active);
|
|
|
$active = key($this->_active);
|
|
|
$content = ob_get_clean();
|
|
|
- array_pop($this->_active);
|
|
|
if($mode === ViewBlock::OVERRIDE) {
|
|
|
$this->_blocks[$active] = $content;
|
|
|
} else {
|
|
|
$this->concat($active, $content, $mode);
|
|
|
}
|
|
|
+ array_pop($this->_active);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -207,7 +207,8 @@ class ViewBlock
|
|
|
*/
|
|
|
public function active()
|
|
|
{
|
|
|
- return end($this->_active);
|
|
|
+ end($this->_active);
|
|
|
+ return key($this->_active);
|
|
|
}
|
|
|
|
|
|
/**
|