From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 28 Oct 2011 10:25:41 +0000 (+0200)
Subject: Allow any, but the first two arguments to be optional.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=699e1232ababcd449df33ac54789a0c67a53643e;p=konrad%2Ftwig.git

Allow any, but the first two arguments to be optional.
---

diff --git a/twig.c b/twig.c
index 8084dac..9b5735f 100644
--- a/twig.c
+++ b/twig.c
@@ -695,7 +695,7 @@ PHP_FUNCTION(twig_template_get_attributes)
 	zval *template;
 	zval *object;
 	zval *item;
-	zval *arguments;
+	zval *arguments = NULL;
 	zval *ret = NULL;
 	char *type = NULL;
 	int   type_len = 0;
@@ -703,10 +703,14 @@ PHP_FUNCTION(twig_template_get_attributes)
 	zend_bool ignoreStrictCheck = 0;
 	int free_ret = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ozzasbb", &template, &object, &item, &arguments, &type, &type_len, &isDefinedTest, &ignoreStrictCheck) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ozz|asbb", &template, &object, &item, &arguments, &type, &type_len, &isDefinedTest, &ignoreStrictCheck) == FAILURE) {
 		return;
 	}
 
+	if (!type) {
+		type = "any";
+	}
+
 /*
 	// array
 	if (Twig_TemplateInterface::METHOD_CALL !== $type) {