diff options
| author | Felipe Pena <felipe@php.net> | 2008-06-05 19:14:25 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-06-05 19:14:25 +0000 |
| commit | 0e74a12ae1f92784429b1c54dfaafe891753e3d7 (patch) | |
| tree | b54f708e79acd2a429ba62206abed2d984a25eed /Zend | |
| parent | 14b1567a6ffc18c2b9fc78378d413d0aba57f3e6 (diff) | |
| download | php-git-0e74a12ae1f92784429b1c54dfaafe891753e3d7.tar.gz | |
- MFB: Fixed bug #45180 ('class::method' works differently than array('class', 'method'))
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 00cc88743b..b33f63857a 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1001,6 +1001,10 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS } else { EX(function_state).function = zend_std_get_static_method(calling_scope, Z_TYPE_P(fci->function_name), fname, fname_len TSRMLS_CC); } + + if (((zend_internal_function*)EX(function_state).function)->handler == zend_std_call_user_call) { + fci->object_pp = &EG(This); + } if (check_scope_or_static && EX(function_state).function && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC) |