diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-14 18:39:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-14 18:39:48 +0200 |
| commit | 0bda0422af0a9a920135bf3d7b7b4784eb0df802 (patch) | |
| tree | 53c9577143b24f034fb560c97f904077c2f63ba1 /Zend/zend_API.c | |
| parent | 5aaffb79084ba929675a7e8543f91ff324439939 (diff) | |
| parent | 411eee7b5ae8b529b10184f98e3f9b02d93ba864 (diff) | |
| download | php-git-0bda0422af0a9a920135bf3d7b7b4784eb0df802.tar.gz | |
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_vm_execute.h
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 096b494e30..de9cdfd88d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3104,7 +3104,7 @@ get_function_via_handler: retval = 0; } else { zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(fcc->calling_scope->name), ZSTR_VAL(fcc->function_handler->common.function_name)); - return 0; + retval = 0; } } else if (!fcc->object && !(fcc->function_handler->common.fn_flags & ZEND_ACC_STATIC)) { int severity; |