Skip to content

Commit f67bdd2

Browse files
author
Kyle Spraggs
committed
Return early from Renderering if we can't render. Use cloned view manager helper.
1 parent 62a5a50 commit f67bdd2

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/ZfcTwig/Module.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function getServiceConfig()
5656
// If we don't clone it then the ViewHelpers use PhpRenderer.
5757
// This should really be changed in ZF Proper to call the event to determine which Renderer to use.
5858
//return clone $sm->get('ViewHelperManager');
59-
return $sm->get('ViewHelperManager');
59+
return clone $sm->get('ViewHelperManager');
6060
},
6161
'ZfcTwigViewStrategy' => function($sm) {
6262
$strategy = new TwigStrategy($sm->get('ZfcTwigRenderer'));

src/ZfcTwig/View/Renderer/TwigRenderer.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@ public function render($nameOrModel, $values = array())
194194
$values = (array) $model->getVariables();
195195
}
196196

197+
if (!$this->canRender($nameOrModel)) {
198+
return null;
199+
}
200+
197201
if ($model && $this->canRenderTrees() && $model->hasChildren()) {
198202
if (!isset($values['content'])) {
199203
$values['content'] = '';
@@ -211,9 +215,6 @@ public function render($nameOrModel, $values = array())
211215

212216
/** @var $template \Twig_Template */
213217
$template = $this->resolver->resolve($nameOrModel, $this);
214-
if ($template) {
215-
return $template->render((array) $values);
216-
}
217-
return null;
218+
return $template->render((array) $values);
218219
}
219220
}

0 commit comments

Comments
 (0)