Skip to content

Commit

Permalink
Merge branch 'master' of github.com:cakephp/cakephp
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed May 29, 2015
2 parents 6578de6 + 5cd7c21 commit 7397ba3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
17 changes: 17 additions & 0 deletions src/View/View.php
Expand Up @@ -551,6 +551,23 @@ public function blocks()
/**
* Start capturing output for a 'block'
*
* You can use start on a block multiple times to
* append or prepend content in a capture mode.
*
* ```
* // Append content to an existing block.
* $this->start('content');
* echo $this->fetch('content');
* echo 'Some new content';
* $this->end();
*
* // Prepend content to an existing block
* $this->start('content');
* echo 'Some new content';
* echo $this->fetch('content');
* $this->end();
* ```
*
* @param string $name The name of the block to capture for.
* @return void
* @see ViewBlock::start()
Expand Down
3 changes: 1 addition & 2 deletions src/View/ViewBlock.php
Expand Up @@ -57,9 +57,8 @@ class ViewBlock
/**
* Should the currently captured content be discarded on ViewBlock::end()
*
* @var bool
* @see ViewBlock::end()
* @see ViewBlock::startIfEmpty()
* @var bool
*/
protected $_discardActiveBufferOnEnd = false;

Expand Down

0 comments on commit 7397ba3

Please sign in to comment.