diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-03 18:42:33 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-03 18:42:33 +0100 |
| commit | 000b504b51cb3a82df0496789f249bdfed65c11b (patch) | |
| tree | 796b68396f7a049745f2cb10e00999df57bf4121 | |
| parent | 6303dd1ea44255ea121858bb23563d803696cca8 (diff) | |
| parent | f3b1ecb6c8b6f738ace61f76796be90cf990a690 (diff) | |
| download | php-git-000b504b51cb3a82df0496789f249bdfed65c11b.tar.gz | |
Merge branch 'PHP-7.1'
| -rw-r--r-- | ext/dom/document.c | 8 | ||||
| -rw-r--r-- | ext/dom/tests/bug74004.phpt | 15 |
2 files changed, 4 insertions, 19 deletions
diff --git a/ext/dom/document.c b/ext/dom/document.c index cac6830077..18d652064e 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); diff --git a/ext/dom/tests/bug74004.phpt b/ext/dom/tests/bug74004.phpt deleted file mode 100644 index 853dfa5b09..0000000000 --- a/ext/dom/tests/bug74004.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---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 |