geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added another workaround for PHP 5.4 support.

Browse Source
This commit is contained in:
Derick Rethans
2011-11-20 21:41:07 +00:00
parent c4055d2eb0
commit 229c07c6a6
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/twig/twig.c
+12
View File
@@ -277,7 +277,11 @@ zval *TWIG_GET_STATIC_PROPERTY(zval *class, char *prop_name)
}
ce = zend_get_class_entry(class);
#if PHP_VERSION_ID >= 50400
tmp_zval = zend_std_get_static_property(ce, prop_name, strlen(prop_name), 0, NULL TSRMLS_CC);
#else
tmp_zval = zend_std_get_static_property(ce, prop_name, strlen(prop_name), 0 TSRMLS_CC);
#endif
return *tmp_zval;
}
@@ -348,7 +352,11 @@ zval *TWIG_PROPERTY(zval *object, zval *propname)
}
if (Z_OBJ_HT_P(object)->read_property) {
#if PHP_VERSION_ID >= 50400
tmp = Z_OBJ_HT_P(object)->read_property(object, propname, BP_VAR_IS, NULL TSRMLS_CC);
#else
tmp = Z_OBJ_HT_P(object)->read_property(object, propname, BP_VAR_IS TSRMLS_CC);
#endif
if (tmp != EG(uninitialized_zval_ptr)) {
return tmp;
} else {
@@ -361,7 +369,11 @@ zval *TWIG_PROPERTY(zval *object, zval *propname)
int TWIG_HAS_PROPERTY(zval *object, zval *propname)
{
if (Z_OBJ_HT_P(object)->has_property) {
#if PHP_VERSION_ID >= 50400
return Z_OBJ_HT_P(object)->has_property(object, propname, 0, NULL TSRMLS_CC);
#else
return Z_OBJ_HT_P(object)->has_property(object, propname, 0 TSRMLS_CC);
#endif
}
return 0;
}