From d14670ccdb2782abaaaa721d1c379138fa64aae6 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Wed, 18 Dec 2013 07:25:05 +0100
Subject: 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
---
 ext/zip/php_zip.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ext/zip/php_zip.c')

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);
 			}
-- 
cgit v1.2.1