From: Zeev Suraski <zeev@php.net>
Date: Sat, 7 Dec 2002 15:53:37 +0000 (+0000)
Subject: Fix error messages
X-Git-Tag: RELEASE_1_0b3~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c087d9e9e498ff60e245c0235993cc7b05a56154;p=php

Fix error messages
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 6259477501..1c987a8d65 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2257,6 +2257,8 @@ int zend_init_ctor_call_handler(ZEND_OPCODE_HANDLER_ARGS)
  */
 inline int zend_check_private(zend_execute_data *execute_data, zend_class_entry *ce, int fn_flags, char *function_name_strval, int function_name_strlen TSRMLS_DC)
 {
+	zend_function *orig_fbc;
+
 	if (!ce) {
 		return 0;
 	}
@@ -2271,6 +2273,8 @@ inline int zend_check_private(zend_execute_data *execute_data, zend_class_entry
 		return 1;
 	}
 
+	orig_fbc = EX(fbc);
+
 	/* Check rule #2 */
 	while (ce) {
 		if (ce == EG(scope)) {
@@ -2283,6 +2287,8 @@ inline int zend_check_private(zend_execute_data *execute_data, zend_class_entry
 		}
 		ce = ce->parent;
 	}
+
+	EX(fbc) = orig_fbc;
 	return 0;
 }