projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix tests, connection status can be 2 digits
[m6w6/ext-pq]
/
src
/
php_pq_object.c
diff --git
a/src/php_pq_object.c
b/src/php_pq_object.c
index f84bb28adaba5c50ffdf620221c8966288224610..c8d1e50bc73d4b1df3c119c48dabf396b4223e2e 100644
(file)
--- a/
src/php_pq_object.c
+++ b/
src/php_pq_object.c
@@
-103,7
+103,11
@@
static int apply_pi_to_ht(zval *p, void *a)
zval zobj;
ZVAL_OBJ(&zobj, &arg->pq_obj->zo);
zval zobj;
ZVAL_OBJ(&zobj, &arg->pq_obj->zo);
+# if PHP_VERSION_ID < 70100
+ property = zend_read_property(arg->pq_obj->zo.ce, &zobj, pi->name->val, pi->name->len, 0, &tmp_prop);
+# else
property = zend_read_property_ex(arg->pq_obj->zo.ce, &zobj, pi->name, 0, &tmp_prop);
property = zend_read_property_ex(arg->pq_obj->zo.ce, &zobj, pi->name, 0, &tmp_prop);
+# endif
#else
property = zend_read_property_ex(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name, 0, &tmp_prop);
#endif
#else
property = zend_read_property_ex(arg->pq_obj->zo.ce, &arg->pq_obj->zo, pi->name, 0, &tmp_prop);
#endif
@@
-240,7
+244,7
@@
zval *php_pq_object_read_prop(zval *object, zval *member, int type, void **cache
if (SUCCESS != php_pq_object_read_prop_ex(Z_OBJ_P(object), member_str, type, tmp)) {
zend_string_release(member_str);
if (SUCCESS != php_pq_object_read_prop_ex(Z_OBJ_P(object), member_str, type, tmp)) {
zend_string_release(member_str);
- return zend_
std_
read_property(object, member, type, cache_slot, tmp);
+ return zend_
get_std_object_handlers()->
read_property(object, member, type, cache_slot, tmp);
}
zend_string_release(member_str);
}
zend_string_release(member_str);