Fixes ZF-Commons#60 and ZF-Commons#61.

Kyle Spraggs · Kyle Spraggs · commit c9a21332d344 · 2013-04-18T16:20:42.000-05:00
diff --git a/src/ZfcTwig/View/Renderer/TwigRenderer.php b/src/ZfcTwig/View/Renderer/TwigRenderer.php
@@ -188,9 +188,12 @@ public function render($nameOrModel, $values = array())
             $values = (array) $model->getVariables();
         }
 
-        $children = $model->getChildren();
-        if ($this->canRenderTrees() && !empty($children)) {
-            $nameOrModel = $children[0]->getTemplate();
+        if ($model) {
+            $children = $model->getChildren();
+            if ($this->canRenderTrees() && !empty($children)) {
+                $nameOrModel = $children[0]->getTemplate();
+                $values      = (array) $children[0]->getVariables();
+            }
         }
 
         /** @var $template \Twig_Template */
@@ -201,3 +204,4 @@ public function render($nameOrModel, $values = array())
         return null;
     }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,12 @@ public function render($nameOrModel, $values = array())`
`188`	`188`	`$values = (array) $model->getVariables();`
`189`	`189`	`}`
`190`	`190`
`191`		`- $children = $model->getChildren();`
`192`		`- if ($this->canRenderTrees() && !empty($children)) {`
`193`		`- $nameOrModel = $children[0]->getTemplate();`
	`191`	`+ if ($model) {`
	`192`	`+ $children = $model->getChildren();`
	`193`	`+ if ($this->canRenderTrees() && !empty($children)) {`
	`194`	`+ $nameOrModel = $children[0]->getTemplate();`
	`195`	`+ $values = (array) $children[0]->getVariables();`
	`196`	`+ }`
`194`	`197`	`}`
`195`	`198`
`196`	`199`	`/** @var $template \Twig_Template */`
`@@ -201,3 +204,4 @@ public function render($nameOrModel, $values = array())`
`201`	`204`	`return null;`
`202`	`205`	`}`
`203`	`206`	`}`
	`207`	`+`