From 7fce03c5bd7020df2cfdc3dd7951facdb1854692 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 6 Feb 2010 13:30:24 +0100
Subject: [PATCH] [Templating] renamed content slot to _content to avoid name
 collisions

---
 src/Symfony/Components/Templating/Engine.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Components/Templating/Engine.php b/src/Symfony/Components/Templating/Engine.php
index 56d79af43d..13746a3f80 100644
--- a/src/Symfony/Components/Templating/Engine.php
+++ b/src/Symfony/Components/Templating/Engine.php
@@ -121,12 +121,12 @@ class Engine
     if ($this->parents[$name])
     {
       $slots = $this->get('slots');
-      $this->stack[] = $slots->get('content');
-      $slots->set('content', $content);
+      $this->stack[] = $slots->get('_content');
+      $slots->set('_content', $content);
 
       $content = $this->render($this->parents[$name], $parameters);
 
-      $slots->set('content', array_pop($this->stack));
+      $slots->set('_content', array_pop($this->stack));
     }
 
     return $content;