summaryrefslogtreecommitdiff
path: root/ext/dom/php_dom.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2008-03-18 14:10:45 +0000
committerFelipe Pena <felipe@php.net>2008-03-18 14:10:45 +0000
commit2b10c53ae16bb79c5f6dd0da61d6b3c451251802 (patch)
tree97ff7a379e380d56f87547587fafb8540761ad25 /ext/dom/php_dom.c
parent8b01532f64cfeb88270b1a8b13c52dd76aa3d999 (diff)
downloadphp-git-2b10c53ae16bb79c5f6dd0da61d6b3c451251802.tar.gz
MFH: Dropped zend.ze1_compatibility_mode
[DOC]
Diffstat (limited to 'ext/dom/php_dom.c')
-rw-r--r--ext/dom/php_dom.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index f854bafc72..eb7562a1b4 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -69,7 +69,6 @@ zend_class_entry *dom_xpath_class_entry;
zend_class_entry *dom_namespace_node_class_entry;
zend_object_handlers dom_object_handlers;
-zend_object_handlers dom_ze1_object_handlers;
static HashTable classes;
@@ -504,25 +503,13 @@ zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC)
return retval;
}
-
-zend_object_value dom_objects_ze1_clone_obj(zval *zobject TSRMLS_DC)
-{
- php_error(E_ERROR, "Cannot clone object of class %s due to 'zend.ze1_compatibility_mode'", Z_OBJCE_P(zobject)->name);
- /* Return zobject->value.obj just to satisfy compiler */
- return zobject->value.obj;
-}
-
static const zend_function_entry dom_functions[] = {
PHP_FE(dom_import_simplexml, NULL)
{NULL, NULL, NULL}
};
static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
- if (EG(ze1_compatibility_mode)) {
- return &dom_ze1_object_handlers;
- } else {
- return &dom_object_handlers;
- }
+ return &dom_object_handlers;
}
static const zend_module_dep dom_deps[] = {
@@ -561,13 +548,6 @@ PHP_MINIT_FUNCTION(dom)
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
dom_object_handlers.has_property = dom_property_exists;
- memcpy(&dom_ze1_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- dom_ze1_object_handlers.read_property = dom_read_property;
- dom_ze1_object_handlers.write_property = dom_write_property;
- dom_ze1_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
- dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
- dom_ze1_object_handlers.has_property = dom_property_exists;
-
zend_hash_init(&classes, 0, NULL, NULL, 1);
INIT_CLASS_ENTRY(ce, "DOMException", php_dom_domexception_class_functions);