- Fixed bug #55326 (Trait method copying misindentifies serialization callbacks)

patch by: Gustavo Lopes (cataphract@php)
This commit is contained in:
Felipe Pena 2011-07-31 12:27:47 +00:00
parent 0b619f4f0b
commit f52197815a

View File

@ -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