Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML

diff --git a/ext/dom/document.c b/ext/dom/document.c
index cab0aa55ce43a8d1983741b407e7232add83e5cc..a884087f5f0019da1e64d433985ba31bf7341e2c 100644 (file)
--- 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);

diff --git a/ext/dom/tests/bug74004.phpt b/ext/dom/tests/bug74004.phpt
new file mode 100644 (file)
index 0000000..853dfa5
--- /dev/null
+++ b/ext/dom/tests/bug74004.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #74004 (DOMDocument->loadHTML and ->loadHTMLFile do not heed LIBXML_NOWARNING and LIBXML_NOERROR options)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+$doc=new DOMDocument();
+libxml_use_internal_errors(true);
+$doc->loadHTML("<tag-throw-warning></tag-throw-warning>",LIBXML_NOWARNING|LIBXML_NOERROR);
+print count(libxml_get_errors());
+
+?>
+--EXPECT--
+0