mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-19 10:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix confusing logic (sync with HEAD)

Browse Source
This commit is contained in:
Jani Taskinen 2007-11-05 11:43:31 +00:00
parent ba9c241e66
commit 129c125f7f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/zend_API.c
View File

@ -2466,11 +2466,17 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, char **
}
lcname = zend_str_tolower_dup(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj));
if (Z_STRLEN_PP(obj) == sizeof("self") - 1 && memcmp(lcname, "self", sizeof("self")-1) == 0 && EG(active_op_array)) {
if (EG(active_op_array) &&
Z_STRLEN_PP(obj) == sizeof("self") - 1 &&
!memcmp(lcname, "self", sizeof("self") - 1)) {
ce = EG(active_op_array)->scope;
} else if (Z_STRLEN_PP(obj) == sizeof("parent") - 1 && memcmp(lcname, "parent", sizeof("parent")-1) == 0 && EG(active_op_array) && EG(active_op_array)->scope) {
} else if (EG(active_op_array) && EG(active_op_array)->scope &&
Z_STRLEN_PP(obj) == sizeof("parent") - 1 &&
!memcmp(lcname, "parent", sizeof("parent") - 1)) {
ce = EG(active_op_array)->scope->parent;
} else if (Z_STRLEN_PP(obj) == sizeof("static")-1 && !memcmp(lcname, "static", sizeof("static")-1)) {
} else if (Z_STRLEN_PP(obj) == sizeof("static") - 1 &&
!memcmp(lcname, "static", sizeof("static") - 1)) {
ce = EG(called_scope);
} else if (zend_lookup_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), &pce TSRMLS_CC) == SUCCESS) {
ce = *pce;