diff options
| author | Felipe Pena <felipe@php.net> | 2010-11-03 01:35:26 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-11-03 01:35:26 +0000 |
| commit | 815d0e549b20027e75b6fb678d4026a0b2e7c36b (patch) | |
| tree | 9caa7631fcbb5fed60f81da575d6b23cab9dd2ef /Zend/zend_object_handlers.c | |
| parent | 7b4cbadfce17213eee0500eef9e50aefac3f4a92 (diff) | |
| download | php-git-815d0e549b20027e75b6fb678d4026a0b2e7c36b.tar.gz | |
- Reverted fix for bug #51176
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 291655027f..026f15dad8 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -984,13 +984,13 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *f if (!fbc && zend_hash_find(&ce->function_table, lc_function_name, function_name_strlen+1, (void **) &fbc)==FAILURE) { efree(lc_function_name); - if (ce->__callstatic) { - return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen); - } else if (ce->__call && + if (ce->__call && EG(This) && Z_OBJ_HT_P(EG(This))->get_class_entry && instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) { return zend_get_user_call_function(ce, function_name_strval, function_name_strlen); + } else if (ce->__callstatic) { + return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen); } else { return NULL; } |