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 | e3ced0b54018984fe732dafabdf5c55893263a65 (patch) | |
| tree | 4dd57ddf877bac2f833f9106bbd6206cde865d58 /Zend/zend_object_handlers.c | |
| parent | f11535e2eee07e515066774eb166ddec73da91b3 (diff) | |
| download | php-git-e3ced0b54018984fe732dafabdf5c55893263a65.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 a708f9ad8c..b876d04a02 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1134,13 +1134,13 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *f free_alloca(lc_function_name, use_heap); } - 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; } |