Bailout when we have an exception to defer to PHP's exception handlers.

This commit is contained in:
Derick Rethans
2011-07-13 16:27:35 +01:00
parent 9facb8d991
commit 52b9ae44bb
+6
View File
@@ -736,6 +736,9 @@ PHP_FUNCTION(twig_template_get_attributes)
if (TWIG_CALL_SB(TWIG_PROPERTY_CHAR(template, "env"), "hasExtension", "sandbox")) {
TWIG_CALL_ZZ(TWIG_CALL_S(TWIG_PROPERTY_CHAR(template, "env"), "getExtension", "sandbox"), "checkPropertyAllowed", object, item);
}
if (EG(exception)) {
return;
}
convert_to_string(item);
ret = TWIG_PROPERTY(object, item);
@@ -818,6 +821,9 @@ PHP_FUNCTION(twig_template_get_attributes)
if (TWIG_CALL_SB(TWIG_PROPERTY_CHAR(template, "env"), "hasExtension", "sandbox")) {
TWIG_CALL_ZZ(TWIG_CALL_S(TWIG_PROPERTY_CHAR(template, "env"), "getExtension", "sandbox"), "checkMethodAllowed", object, item);
}
if (EG(exception)) {
return;
}
/*
$ret = call_user_func_array(array($object, $method), $arguments);
*/