diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-11 14:31:40 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-11 14:31:40 +0300 |
| commit | 14b24340c803c3700cb604bb46d2d5c3e9675640 (patch) | |
| tree | 584a753a466c2c8cfa3457a2f9dd9402b350778c /Zend/zend_API.c | |
| parent | 6dd745042750993ade9426637a2cae71d8078b8d (diff) | |
| parent | a1b7ccdfc69a1ad9938039f687ad7059ed1bd506 (diff) | |
| download | php-git-14b24340c803c3700cb604bb46d2d5c3e9675640.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #77877 (call_user_func() passes $this to satatic methods).
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 00161da07e..b3a617ee62 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3027,6 +3027,10 @@ get_function_via_handler: if (fcc->object) { fcc->called_scope = fcc->object->ce; + if (fcc->function_handler + && fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC) { + fcc->object = NULL; + } } return retval; } |