* Fix Zend version

* Fix a method call bug
This commit is contained in:
Andi Gutmans 1999-07-19 19:58:44 +00:00
parent 5fdd45695b
commit e78fc33c35
3 changed files with 4 additions and 7 deletions

View file

@ -21,7 +21,7 @@
#ifndef _ZEND_H
#define _ZEND_H
#define ZEND_VERSION "0.80A"
#define ZEND_VERSION "0.90"
#ifdef __cplusplus

View file

@ -1294,7 +1294,8 @@ binary_assign_op_addr: {
object_ptr = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_R);
if (!object_ptr || (*object_ptr)->value.obj.ce->handle_function_call) { /* overloaded function call */
if (!object_ptr
|| ((*object_ptr)->type==IS_OBJECT && (*object_ptr)->value.obj.ce->handle_function_call)) { /* overloaded function call */
zend_overloaded_element overloaded_element;
zend_property_reference *property_reference;
@ -1304,10 +1305,6 @@ binary_assign_op_addr: {
if (object_ptr) {
zend_property_reference property_reference;
if ((*object_ptr)->type != IS_OBJECT) {
zend_error(E_ERROR, "Call to a member function on a non-object");
}
property_reference.object = object_ptr;
property_reference.type = BP_VAR_NA;
zend_llist_init(&property_reference.elements_list, sizeof(zend_overloaded_element), NULL, 0);

View file

@ -86,7 +86,7 @@ ZEND_API int zend_get_resource_handle();
#define ZEND_EXTENSION() \
ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.80A", ZTS_V, ZEND_DEBUG_V }
ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.90", ZTS_V, ZEND_DEBUG_V }
#define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1