- Require $this-> when calling a methods. This whole automatic lookup

- first in the class and then in the global scope is confusing, slow and
- not quite BC compatible.

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index edeb00ef65920e0cd2a14bad5a14c0dd1130ac51..299cbfd20d181be42737226b6f20c152d2e51504 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2027,6 +2027,7 @@ binary_assign_op_addr_obj:
                                        
 
                                        do {
+                                               /*
                                                if (EG(scope)) {
                                                        if (zend_hash_find(&EG(scope)->function_table, function_name_strval, function_name_strlen+1, (void **) &function) == SUCCESS) {
                                                                if ((EX(object) = EG(This))) {
@@ -2036,6 +2037,7 @@ binary_assign_op_addr_obj:
                                                                break;
                                                        }
                                                }
+                                               */
                                                if (zend_hash_find(EG(function_table), function_name_strval, function_name_strlen+1, (void **) &function)==FAILURE) {
                                                        zend_error(E_ERROR, "Call to undefined function:  %s()", function_name_strval);
                                                }