]> granicus.if.org Git - php/commitdiff
Remove unnecessary if
authorMarcus Boerger <helly@php.net>
Sun, 17 Aug 2003 12:38:27 +0000 (12:38 +0000)
committerMarcus Boerger <helly@php.net>
Sun, 17 Aug 2003 12:38:27 +0000 (12:38 +0000)
Zend/zend_execute.c

index eaf6a5801ac4723b610e3979cbad6d40ad2ad5bd..f09836d43e7c538ba5d77d251fdf0ddad56bc845 100644 (file)
@@ -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) {