From 16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 28 Jul 2015 11:06:52 +0800 Subject: [PATCH] Attempt to fix bug35437.phpt fails --- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index ce5d520aa2..9273333117 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3096,8 +3096,8 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSE zend_ce_error, "Non-static method %s::%s() cannot be called statically", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); - HANDLE_EXCEPTION(); } + HANDLE_EXCEPTION(); } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index da2eeada13..3f800b120d 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5663,8 +5663,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C zend_ce_error, "Non-static method %s::%s() cannot be called statically", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); - HANDLE_EXCEPTION(); } + HANDLE_EXCEPTION(); } } -- 2.50.1