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

Implement HAS_PROPERTY to distinguish between not-set and NULL.

Browse Source
This commit is contained in:
Derick Rethans
2011-07-18 18:46:12 +01:00
parent 541f6c8478
commit 53e1652d80
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twig.c
+13 -2
View File
@@ -356,6 +356,18 @@ zval *TWIG_PROPERTY(zval *object, zval *propname)
return tmp;
}
zval *TWIG_HAS_PROPERTY(zval *object, zval *propname)
{
char *prot_name;
int prot_name_length;
zval *tmp = 1;
if (Z_OBJ_HT_P(object)->has_property) {
return Z_OBJ_HT_P(object)->has_property(object, propname, 0 TSRMLS_CC);
}
return 0;
}
zval *TWIG_PROPERTY_CHAR(zval *object, char *propname)
{
zval *tmp_name_zval, *tmp;
@@ -818,10 +830,9 @@ PHP_FUNCTION(twig_template_get_attributes)
tmp_properties = TWIG_GET_ARRAY_ELEMENT(tmp_class, "properties", strlen("properties"));
tmp_item = TWIG_GET_ARRAY_ELEMENT_ZVAL(tmp_properties, item);
tmp_object_item = TWIG_PROPERTY(object, item);
efree(class_name);
if (tmp_item || tmp_object_item || TWIG_ARRAY_KEY_EXISTS(object, item) // FIXME: Array key? is that array access here?
if (tmp_item || TWIG_HAS_PROPERTY(object, item) || TWIG_ARRAY_KEY_EXISTS(object, item) // FIXME: Array key? is that array access here?
) {
if (isDefinedTest) {
RETURN_TRUE;