This commit is contained in:
Fabien Potencier
2014-10-22 16:37:50 +02:00
parent c2a1385389
commit 8d9a00df2c
+11 -11
View File
@@ -61,19 +61,19 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function getParent(array $context)
{
if (null === $this->parent) {
try {
$parent = $this->doGetParent($context);
$this->parent = false === $parent ? false : $this->env->resolveTemplate($parent);
} catch (Twig_Error_Loader $e) {
$e->setTemplateFile(null);
$e->guess();
throw $e;
}
if (null !== $this->parent) {
return $this->parent;
}
return $this->parent;
try {
$parent = $this->doGetParent($context);
return $this->parent = false === $parent ? false : $this->env->resolveTemplate($parent);
} catch (Twig_Error_Loader $e) {
$e->setTemplateFile(null);
$e->guess();
throw $e;
}
}
protected function doGetParent(array $context)