typo

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 926168efe59cffd5a797702a63fd635e5a7b2605..3f9597b49a203da2ac0788227c4a3f89633ef8f1 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1756,7 +1756,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, ANY, CONST|TMP|VAR|UNUSED|CV)
                if (OP2_TYPE != IS_UNUSED &&
                    EG(This) &&
                    Z_OBJ_HT_P(EG(This))->get_class_entry &&
-                   !instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) { 
+                   !instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) {
                    /* We are calling method of the other (incompatible) class,
                       but passing $this. This is done for compatibility with php-4. */
                        zend_error(E_STRICT, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", EX(fbc)->common.scope->name, EX(fbc)->common.function_name);
@@ -2062,9 +2062,7 @@ ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY)
                                if (OP1_TYPE == IS_VAR && !OP1_FREE) {
                                        PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
                                }
-//                             if (opline->extended_value != ZEND_RETURNS_NEW) {
-                                       zend_error(E_NOTICE, "Only variable references should be returned by reference");
-//                             }
+                               zend_error(E_NOTICE, "Only variable references should be returned by reference");
                                ZEND_VM_C_GOTO(return_by_value);
                        }
                }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c47387dc99089f8f2c151f533d54d9c3c40ed842..a912b5582b870b57f65132b0273db098d51e1e51 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1639,9 +1639,7 @@ static int ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (IS_CONST == IS_VAR && !0) {
                                        PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
                                }
-//                             if (opline->extended_value != ZEND_RETURNS_NEW) {
-                                       zend_error(E_NOTICE, "Only variable references should be returned by reference");
-//                             }
+                               zend_error(E_NOTICE, "Only variable references should be returned by reference");
                                goto return_by_value;
                        }
                }
@@ -4117,9 +4115,7 @@ static int ZEND_RETURN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (IS_TMP_VAR == IS_VAR && !1) {
                                        PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
                                }
-//                             if (opline->extended_value != ZEND_RETURNS_NEW) {
-                                       zend_error(E_NOTICE, "Only variable references should be returned by reference");
-//                             }
+                               zend_error(E_NOTICE, "Only variable references should be returned by reference");
                                goto return_by_value;
                        }
                }
@@ -7102,9 +7098,7 @@ static int ZEND_RETURN_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (IS_VAR == IS_VAR && !(free_op1.var != NULL)) {
                                        PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
                                }
-//                             if (opline->extended_value != ZEND_RETURNS_NEW) {
-                                       zend_error(E_NOTICE, "Only variable references should be returned by reference");
-//                             }
+                               zend_error(E_NOTICE, "Only variable references should be returned by reference");
                                goto return_by_value;
                        }
                }
@@ -19729,9 +19723,7 @@ static int ZEND_RETURN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                                if (IS_CV == IS_VAR && !0) {
                                        PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */
                                }
-//                             if (opline->extended_value != ZEND_RETURNS_NEW) {
-                                       zend_error(E_NOTICE, "Only variable references should be returned by reference");
-//                             }
+                               zend_error(E_NOTICE, "Only variable references should be returned by reference");
                                goto return_by_value;
                        }
                }