svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c
| From: | Felipe Pena | Date: | Sun, 31 Jul 2011 12:27:47 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65655@lists.php.net to get a copy of this message | ||
felipe Sun, 31 Jul 2011 12:27:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313991
Log:
- Fixed bug #55326 (Trait method copying misindentifies serialization callbacks)
patch by: Gustavo Lopes (cataphract@php)
Bug: https://bugs.php.net/55326 (Open) Trait method copying
misindentifies serialization callbacks
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-07-31 10:11:20 UTC (rev 313990)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-07-31 12:27:47 UTC (rev 313991)
@@ -3476,8 +3476,6 @@
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
Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c 2011-07-31 10:11:20 UTC (rev 313990)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-07-31 12:27:47 UTC (rev 313991)
@@ -3476,8 +3476,6 @@
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