summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2013-12-18 07:25:05 +0100
committerKalle Sommer Nielsen <kalle@php.net>2013-12-18 07:25:05 +0100
commitd14670ccdb2782abaaaa721d1c379138fa64aae6 (patch)
tree1176c5deddd0efefa69f0f29892c710607b76633 /ext/zip/php_zip.c
parent1433dec2d0c00fcda5bebaeebefca8264deb912a (diff)
downloadphp-git-d14670ccdb2782abaaaa721d1c379138fa64aae6.tar.gz
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
# Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
Diffstat (limited to 'ext/zip/php_zip.c')
-rw-r--r--ext/zip/php_zip.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index cd1d7cd425..7aaa48d250 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1010,7 +1010,11 @@ static int php_zip_has_property(zval *object, zval *member, int type KEY_ARG_DC
Z_SET_REFCOUNT_P(tmp, 1);
Z_UNSET_ISREF_P(tmp);
if (type == 1) {
+#if PHP_VERSION_ID >= 50699
+ retval = zend_is_true(tmp TSRMLS_CC);
+#else
retval = zend_is_true(tmp);
+#endif
} else if (type == 0) {
retval = (Z_TYPE_P(tmp) != IS_NULL);
}