From 0b6f7bddf4b7cd4905781506009a911edd5e2dcb Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Sat, 2 Aug 2003 11:43:55 +0000 Subject: [PATCH] fix usage of instanceof here too --- Zend/zend_API.c | 7 ++++--- 1 file 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++; -- 2.40.0