adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating block appending to work better.

Browse source
This commit is contained in:
Mark Story mark@mark-story.com 2011-09-01 20:00:56 +01:00 • committed by mark_story
parent 6d425dfbcb
commit 90f035c54d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Cake/View/View.php
View file

@ -530,7 +530,7 @@ class View extends Object {
* @return void
*/
public function start($name) {
$this->_activeBlock = $name;
$this->__activeBlock = $name;
ob_start();
}
@ -556,6 +556,7 @@ class View extends Object {
}
$this->_blocks[$name] .= $value;
} else {
$this->_blockAppend = true;
$this->start($name);
}
}
@ -583,11 +584,14 @@ class View extends Object {
* @see View::start()
*/
public function end() {
if (!empty($this->_activeBlock)) {
$content = ob_end_clean();
$this->_blocks[$this->_activeBlock] = $content;
if (!empty($this->__activeBlock)) {
$content = ob_get_clean();
if (!isset($this->_blocks[$this->__activeBlock])) {
$this->_blocks[$this->__activeBlock] = '';
}
$this->_blocks[$this->__activeBlock] .= $content;
}
$this->_activeBlock = null;
$this->__activeBlock = null;
}
/**