From: Felipe Pena Date: Sun, 31 Jul 2011 12:27:47 +0000 (+0000) Subject: - Fixed bug #55326 (Trait method copying misindentifies serialization callbacks) X-Git-Tag: php-5.4.0alpha3~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f52197815ac2ed1dfce244f979c811caf8815b6b;p=php - Fixed bug #55326 (Trait method copying misindentifies serialization callbacks) patch by: Gustavo Lopes (cataphract@php) --- diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 035a9b1a4f..e8f9a04ff1 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3476,8 +3476,6 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args else if (!IS_EQUAL(mname, mname_len, "__isset")) (ce)->__isset = (fe); \ else if (!IS_EQUAL(mname, mname_len, "__callstatic"))(ce)->__callstatic = (fe); \ else if (!IS_EQUAL(mname, mname_len, "__tostring")) (ce)->__tostring = (fe); \ - else if (!IS_EQUAL(mname, mname_len, "serialize_func")) (ce)->serialize_func = (fe); \ - else if (!IS_EQUAL(mname, mname_len, "unserialize_func"))(ce)->unserialize_func = (fe); \ } /* {{{ Originates from php_runkit_function_copy_ctor