diff options
| author | Marcus Boerger <helly@php.net> | 2004-01-07 00:02:04 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-01-07 00:02:04 +0000 |
| commit | 82f0c9e7aa79bc31cf96f23d87e7c0513748b1e2 (patch) | |
| tree | 66ad42fc7ebda15491ab1c6d92cd88a090066325 | |
| parent | 68a096f84eb380dd7f9250a207d338f4fe02a01b (diff) | |
| download | php-git-82f0c9e7aa79bc31cf96f23d87e7c0513748b1e2.tar.gz | |
Revert patch that allowed to call sttaic methods via $method()
| -rw-r--r-- | Zend/zend_execute.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 9e6d3a46e9..f3acee7d1f 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -169,11 +169,7 @@ static inline void zend_fetch_property_address_inner(zval *object, znode *op2, z } if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) { - zval **ptr_ptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, prop_ptr TSRMLS_CC); - if(NULL == ptr_ptr) { - zend_error(E_ERROR, "Cannot access undefined property for object with overloaded property access"); - } - T(result->u.var).var.ptr_ptr = ptr_ptr; + T(result->u.var).var.ptr_ptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, prop_ptr TSRMLS_CC); } else if (Z_OBJ_HT_P(object)->read_property) { T(result->u.var).var.ptr = Z_OBJ_HT_P(object)->read_property(object, prop_ptr, 0 TSRMLS_CC); T(result->u.var).var.ptr_ptr = &T(result->u.var).var.ptr; @@ -2470,25 +2466,8 @@ int zend_init_fcall_by_name_handler(ZEND_OPCODE_HANDLER_ARGS) lcname = zend_str_tolower_dup(function_name_strval, function_name_strlen); if (zend_hash_find(EG(function_table), lcname, function_name_strlen+1, (void **) &function)==FAILURE) { - char *method; - zend_class_entry **pce; - - if ((method = strstr(lcname, "::")) != NULL) { - *method = '\0'; - method +=2; - if (zend_lookup_class(lcname, strlen(lcname), &pce TSRMLS_CC) == SUCCESS) { - if (zend_hash_find(&(*pce)->function_table, method, strlen(method)+1, (void **) &function) == FAILURE) { - efree(lcname); - zend_error(E_ERROR, "Call to undefined method %s()", function_name_strval); - } - } else { - efree(lcname); - zend_error(E_ERROR, "Call to method of undefined class %s()", function_name_strval); - } - } else { - efree(lcname); - zend_error(E_ERROR, "Call to undefined function %s()", function_name_strval); - } + efree(lcname); + zend_error(E_ERROR, "Call to undefined function %s()", function_name_strval); } efree(lcname); |