From: Marcus Boerger <helly@php.net>
Date: Sun, 17 Aug 2003 12:38:27 +0000 (+0000)
Subject: Remove unnecessary if
X-Git-Tag: RELEASE_0_7~610
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dbc0bdc3531ed40d60e80eaefbe13efe778f8bd;p=php

Remove unnecessary if
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index eaf6a5801a..f09836d43e 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) {