From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 28 Feb 2012 22:09:42 +0000 (+0100)
Subject: fixed Twig C extension
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=741b11c618dd259d08042b6f989a0e7fbee4164e;p=konrad%2Ftwig.git

fixed Twig C extension
---

diff --git a/CHANGELOG b/CHANGELOG
index 34af8c9..5512dd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.7.0-DEV
 
+ * fixed Twig C extension
  * removed the creation of Twig_Markup instances when not needed
  * added a way to set the default global timezone for dates
  * fixed the slice filter on strings when the length is not specified
diff --git a/ext/twig/twig.c b/ext/twig/twig.c
index 6b1ae11..92b0893 100644
--- a/ext/twig/twig.c
+++ b/ext/twig/twig.c
@@ -531,7 +531,7 @@ int TWIG_CALL_ZZ(zval *object, char *method, zval *arg1, zval *arg2 TSRMLS_DC)
 # define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
 #endif
 
-void TWIG_NEW(zval *object, char *class, zval *arg0 TSRMLS_DC, zval *arg1 TSRMLS_DC)
+void TWIG_NEW(zval *object, char *class, zval *arg0, zval *arg1 TSRMLS_DC)
 {
 	zend_class_entry **pce;
 
@@ -544,7 +544,7 @@ void TWIG_NEW(zval *object, char *class, zval *arg0 TSRMLS_DC, zval *arg1 TSRMLS
 	Z_SET_REFCOUNT_P(object, 1);
 	Z_UNSET_ISREF_P(object);
 
-	TWIG_CALL_ZZ(object, "__construct", arg0 TSRMLS_CC, arg1 TSRMLS_CC);
+	TWIG_CALL_ZZ(object, "__construct", arg0, arg1 TSRMLS_CC);
 }
 
 static int twig_add_array_key_to_string(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
@@ -1001,8 +1001,8 @@ PHP_FUNCTION(twig_template_get_attributes)
 	}
 */
 	if (TWIG_INSTANCE_OF_USERLAND(object, "Twig_TemplateInterface" TSRMLS_CC)) {
-		zval *charset = TWIG_CALL_USER_FUNC_ARRAY(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "getCharset" TSRMLS_CC, NULL TSRMLS_CC);
-		TWIG_NEW(return_value, "Twig_Markup", ret TSRMLS_CC, charset TSRMLS_CC);
+		zval *charset = TWIG_CALL_USER_FUNC_ARRAY(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "getCharset", NULL TSRMLS_CC);
+		TWIG_NEW(return_value, "Twig_Markup", ret, charset TSRMLS_CC);
 		zval_ptr_dtor(&charset);
 		if (ret) {
 			zval_ptr_dtor(&ret);