From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 3 Feb 2017 17:41:36 +0000 (+0100)
Subject: Revert "Merge branch 'pull-request/2344' into PHP-7.0"
X-Git-Tag: php-7.0.17RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcaf4da8a6832f5bc1d0dabee08686cd5cf9e801;p=php

Revert "Merge branch 'pull-request/2344' into PHP-7.0"

This reverts commit 6988d070ea8c7d44452d8c98e594d65ea722a1d8, reversing
changes made to 75ad2b301a047209e7b5a6b5912eb589cfbc773d.
---

diff --git a/NEWS b/NEWS
index e2878e0e59..102c9eae00 100644
--- a/NEWS
+++ b/NEWS
@@ -8,10 +8,6 @@ PHP                                                                        NEWS
   . Fixed bug #73998 (array_key_exists fails on arrays created by
     get_object_vars). (mhagstrand)
 
-- DOM:
-  . Fixed bug #74004 (LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML).
-    (somedaysummer)
-
 - GD:
   . Fixed bug #74031 (ReflectionFunction for imagepng is missing last two
     parameters). (finwe)
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);
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