diff options
| author | Andi Gutmans <andi@php.net> | 1999-07-19 19:58:44 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-07-19 19:58:44 +0000 |
| commit | e78fc33c355da47ec6b94477cd89b830f63f2db7 (patch) | |
| tree | 1530da7b845a962c126381474670486c7b4c8979 /Zend | |
| parent | 5fdd45695bf9fd2055e65e6acee14af112f63d0f (diff) | |
| download | php-git-e78fc33c355da47ec6b94477cd89b830f63f2db7.tar.gz | |
* Fix Zend version
* Fix a method call bug
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.h | 2 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 7 | ||||
| -rw-r--r-- | Zend/zend_extensions.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 4372d329ee..2f08fbe139 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -21,7 +21,7 @@ #ifndef _ZEND_H #define _ZEND_H -#define ZEND_VERSION "0.80A" +#define ZEND_VERSION "0.90" #ifdef __cplusplus diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index e35e86fab1..c0244b74a0 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -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); diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 6bc8119689..cac65a511d 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -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 |