diff options
| author | Wez Furlong <wez@php.net> | 2003-08-02 11:43:55 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-08-02 11:43:55 +0000 |
| commit | 0b6f7bddf4b7cd4905781506009a911edd5e2dcb (patch) | |
| tree | 3e7142fdff241639510a2354f01e9fe9aae8fc81 /Zend/zend_API.c | |
| parent | 4fa6eac1f8bc9c70c87607b71cce522ee71f9fca (diff) | |
| download | php-git-0b6f7bddf4b7cd4905781506009a911edd5e2dcb.tar.gz | |
fix usage of instanceof here too
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index f70152a8b7..c22cef4708 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -605,7 +605,10 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, return FAILURE; } else { - if (!instanceof_function(Z_OBJCE_PP(parameter), ce TSRMLS_CC)) { + if (Z_TYPE_PP(parameter) == IS_OBJECT && + instanceof_function(Z_OBJCE_PP(parameter), ce TSRMLS_CC)) { + *object = *parameter; + } else { if (!quiet) { zend_error(E_WARNING, "%s() expects parameter 1 to be %s, %s given", get_active_function_name(TSRMLS_C), ce->name, @@ -613,8 +616,6 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, } return FAILURE; - } else { - *object = *parameter; } EG(argument_stack).top_element++; |