geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-21 07:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 347bc81d6e, reversing
changes made to 5d7baaf767.
This commit is contained in:
Tugdual Saunier
2013-03-22 16:23:23 +01:00
parent 0bf57a8c9a
commit 438338827b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/twig/twig.c
+3
View File
@@ -511,6 +511,7 @@ static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_arg
{ {
smart_str *buf; smart_str *buf;
char *joiner; char *joiner;
APPLY_TSRMLS_FETCH();
buf = va_arg(args, smart_str*); buf = va_arg(args, smart_str*);
joiner = va_arg(args, char*); 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; char *item;
size_t item_len; size_t item_len;
zend_function *mptr = (zend_function *) pDest; zend_function *mptr = (zend_function *) pDest;
APPLY_TSRMLS_FETCH();
if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) { if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
return 0; return 0;
@@ -665,6 +667,7 @@ static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args,
zval *retval; zval *retval;
char *class_name, *prop_name; char *class_name, *prop_name;
zend_property_info *pptr = (zend_property_info *) pDest; zend_property_info *pptr = (zend_property_info *) pDest;
APPLY_TSRMLS_FETCH();
if (!(pptr->flags & ZEND_ACC_PUBLIC)) { if (!(pptr->flags & ZEND_ACC_PUBLIC)) {
return 0; return 0;