From 6dbc0bdc3531ed40d60e80eaefbe13efe778f8bd Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 17 Aug 2003 12:38:27 +0000 Subject: [PATCH] Remove unnecessary if --- Zend/zend_execute.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index eaf6a5801ac..f09836d43e7 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2480,15 +2480,12 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS) if (EX(function_state).function->type == ZEND_USER_FUNCTION || EX(function_state).function->common.scope) { should_change_scope = 1; - } else { - should_change_scope = 0; - } - - if (should_change_scope) { current_this = EG(This); EG(This) = EX(object); current_scope = EG(scope); EG(scope) = EX(calling_scope); + } else { + should_change_scope = 0; } if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {