From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Fri, 22 Mar 2013 15:23:23 +0000 (+0100)
Subject: Revert "merged branch pierrejoye/master (PR #855)"
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=438338827ba882c35526d5b3c9811caa20bb4156;p=web%2Fkonrad%2Ftwig.git

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3, reversing
changes made to 5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1.
---

diff --git a/ext/twig/twig.c b/ext/twig/twig.c
index f871d1e..bb8a151 100644
--- a/ext/twig/twig.c
+++ b/ext/twig/twig.c
@@ -511,6 +511,7 @@ static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_arg
 {
 	smart_str *buf;
 	char *joiner;
+	APPLY_TSRMLS_FETCH();
 
 	buf = va_arg(args, smart_str*);
 	joiner = va_arg(args, char*);
@@ -643,6 +644,7 @@ static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, v
 	char *item;
 	size_t item_len;
 	zend_function *mptr = (zend_function *) pDest;
+	APPLY_TSRMLS_FETCH();
 
 	if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
 		return 0;
@@ -665,6 +667,7 @@ static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args,
 	zval *retval;
 	char *class_name, *prop_name;
 	zend_property_info *pptr = (zend_property_info *) pDest;
+	APPLY_TSRMLS_FETCH();
 
 	if (!(pptr->flags & ZEND_ACC_PUBLIC)) {
 		return 0;