diff options
| author | Felipe Pena <felipe@php.net> | 2009-01-10 19:15:42 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-01-10 19:15:42 +0000 |
| commit | 23f7fa57fe804d47be6f7f21891e1bb7c0991cfc (patch) | |
| tree | e53bc2b078e4a80842c0e36a4c0d657fa588bd40 /Zend/zend_builtin_functions.c | |
| parent | ac9508b2866560d6d53062306a9a8a3b3a4de6a2 (diff) | |
| download | php-git-23f7fa57fe804d47be6f7f21891e1bb7c0991cfc.tar.gz | |
- MFH: Fixed bug #47054 (BC break in static functions called as dynamic)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 089073443b..72ec836cb3 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -748,10 +748,10 @@ ZEND_FUNCTION(get_called_class) if (EG(called_scope)) { RETURN_STRINGL(EG(called_scope)->name, EG(called_scope)->name_length, 1); - } else { + } else if (!EG(scope)) { zend_error(E_WARNING, "get_called_class() called from outside a class"); - RETURN_FALSE; } + RETURN_FALSE; } /* }}} */ |