Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:10848 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 81098 invoked by uid 1010); 30 Jun 2004 15:06:58 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 81074 invoked from network); 30 Jun 2004 15:06:58 -0000 Received: from unknown (HELO smtp-out5.xs4all.nl) (194.109.24.6) by pb1.pair.com with SMTP; 30 Jun 2004 15:06:58 -0000 Received: from ard.nu (hetty.xs4all.nl [80.126.21.70]) by smtp-out5.xs4all.nl (8.12.10/8.12.10) with ESMTP id i5UF6vUY091636 for ; Wed, 30 Jun 2004 17:06:58 +0200 (CEST) Message-ID: <40E2D712.40306@ard.nu> Date: Wed, 30 Jun 2004 17:06:58 +0200 User-Agent: Mozilla Thunderbird 0.5 (X11/20040306) X-Accept-Language: en-us, en MIME-Version: 1.0 To: internals@lists.php.net X-Enigmail-Version: 0.83.2.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/mixed; boundary="------------090106020102020508070305" Subject: [PATCH] fix for #28167 (repost) From: ard@ard.nu (Ard Biesheuvel) --------------090106020102020508070305 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit This is a possible fix for #28167 Anyone care to have a look ? -- Ard --------------090106020102020508070305 Content-Type: text/plain; name="bug28167.diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="bug28167.diff.txt" Index: zend_builtin_functions.c =================================================================== RCS file: /repository/ZendEngine2/zend_builtin_functions.c,v retrieving revision 1.237 diff -u -r1.237 zend_builtin_functions.c --- zend_builtin_functions.c 28 May 2004 08:08:56 -0000 1.237 +++ zend_builtin_functions.c 21 Jun 2004 12:02:55 -0000 @@ -1628,7 +1628,8 @@ if (function_name) { add_assoc_string_ex(stack_frame, "function", sizeof("function"), function_name, 1); - if (ptr->object) { + if (ptr->object && !strcmp(Z_OBJCE(*ptr->object)->name, + ptr->function_state.function->common.scope->name)) { class_name = Z_OBJCE(*ptr->object)->name; call_type = "->"; } else if (ptr->function_state.function->common.scope) { --------------090106020102020508070305--