summaryrefslogtreecommitdiff
path: root/ext/dom/xpath.c
diff options
context:
space:
mode:
authorEtienne Kneuss <colder@php.net>2008-08-08 22:07:07 +0000
committerEtienne Kneuss <colder@php.net>2008-08-08 22:07:07 +0000
commitc77ca4c34aae8122cc473e618e737d316a008374 (patch)
tree72ce164119e85207a5ff5717237aacb682daf2e5 /ext/dom/xpath.c
parentf9d813df519e50eb94fe09f4d76b12f483ed6b0f (diff)
downloadphp-git-c77ca4c34aae8122cc473e618e737d316a008374.tar.gz
MFH: Fix error_handling usage in various extensions
Diffstat (limited to 'ext/dom/xpath.c')
-rw-r--r--ext/dom/xpath.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 9fa2b30091..a5d9b4c770 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -275,14 +275,14 @@ PHP_METHOD(domxpath, __construct)
dom_object *docobj;
dom_xpath_object *intern;
xmlXPathContextPtr ctx, oldctx;
+ zend_error_handling error_handling;
- php_set_error_handling(EH_THROW, dom_domexception_class_entry TSRMLS_CC);
+ zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC);
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, dom_xpath_class_entry, &doc, dom_document_class_entry) == FAILURE) {
- php_std_error_handling();
return;
}
- php_std_error_handling();
+ zend_restore_error_handling(&error_handling TSRMLS_CC);
DOM_GET_OBJ(docp, doc, xmlDocPtr, docobj);
ctx = xmlXPathNewContext(docp);