diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-21 16:22:46 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-08-21 16:22:46 +0000 |
| commit | 3947bfeadf962a3b9cd037d43bb24deeb56c4ace (patch) | |
| tree | cdb1bcd91639a43f48e9f8ee0f5d6d3caef4825e | |
| parent | da3743b7b92b31804f40a2f68af2962b302db00f (diff) | |
| download | php-git-3947bfeadf962a3b9cd037d43bb24deeb56c4ace.tar.gz | |
Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing the interface)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -12,7 +12,9 @@ - Changed the $context parameter on copy() to actually have an effect. (Kalle) - Fixed possible crash in mssql_fetch_batch(). (Kalle) -- Fixed bug #52654 mysqli doesn't install headers with structures it uses. +- Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing + the interface). (Kalle) +- Fixed bug #52654 (mysqli doesn't install headers with structures it uses). (Andrey) - Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). (Kalle, rein at basefarm dot no) diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 12cedfce75..4802bc2800 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -2536,7 +2536,7 @@ PHP_MINIT_FUNCTION(simplexml) sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC); sxe_class_entry->get_iterator = php_sxe_get_iterator; sxe_class_entry->iterator_funcs.funcs = &php_sxe_iterator_funcs; - zend_class_implements(sxe_class_entry TSRMLS_CC, 1, zend_ce_traversable); + zend_class_implements(sxe_class_entry TSRMLS_CC, 2, zend_ce_traversable, zend_ce_arrayaccess); sxe_object_handlers.get_method = zend_get_std_object_handlers()->get_method; sxe_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor; sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry; |
