From dcaf4da8a6832f5bc1d0dabee08686cd5cf9e801 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 3 Feb 2017 18:41:36 +0100 Subject: Revert "Merge branch 'pull-request/2344' into PHP-7.0" This reverts commit 6988d070ea8c7d44452d8c98e594d65ea722a1d8, reversing changes made to 75ad2b301a047209e7b5a6b5912eb589cfbc773d. --- ext/dom/document.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/dom/document.c') diff --git a/ext/dom/document.c b/ext/dom/document.c index a884087f5f..cab0aa55ce 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -2038,16 +2038,16 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ RETURN_FALSE; } - + if (options) { + htmlCtxtUseOptions(ctxt, (int)options); + } + ctxt->vctxt.error = php_libxml_ctx_error; ctxt->vctxt.warning = php_libxml_ctx_warning; if (ctxt->sax != NULL) { ctxt->sax->error = php_libxml_ctx_error; ctxt->sax->warning = php_libxml_ctx_warning; } - if (options) { - htmlCtxtUseOptions(ctxt, (int)options); - } htmlParseDocument(ctxt); newdoc = ctxt->myDoc; htmlFreeParserCtxt(ctxt); -- cgit v1.2.1