[Templating] renamed content slot to _content to avoid name collisions

This commit is contained in:
Fabien Potencier 2010-02-06 13:30:24 +01:00
parent da364173cb
commit 7fce03c5bd

View File

@ -121,12 +121,12 @@ class Engine
if ($this->parents[$name]) if ($this->parents[$name])
{ {
$slots = $this->get('slots'); $slots = $this->get('slots');
$this->stack[] = $slots->get('content'); $this->stack[] = $slots->get('_content');
$slots->set('content', $content); $slots->set('_content', $content);
$content = $this->render($this->parents[$name], $parameters); $content = $this->render($this->parents[$name], $parameters);
$slots->set('content', array_pop($this->stack)); $slots->set('_content', array_pop($this->stack));
} }
return $content; return $content;