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

symfony · Feb 6, 2010 · 7fce03c · 7fce03c
1 parent da36417
commit 7fce03c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Symfony/Components/Templating/Engine.php b/src/Symfony/Components/Templating/Engine.php
@@ -121,12 +121,12 @@ public function render($name, array $parameters = array())
     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;