From e718c53223da5e812190d2794f18bd1f4c6b121d Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Sat, 21 Jan 2012 11:32:56 +0000 Subject: revert r319254 (fix bug #54682) since it is not correct add test that was broken with that patch. this bug is probably in libtidy itself and not in PHP. I didn't investigate it enough to confirm, though --- ext/tidy/tests/004.phpt | 24 +++++++++++++++++++----- ext/tidy/tidy.c | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'ext/tidy') diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt index e941de452b..7ca17c6d95 100644 --- a/ext/tidy/tests/004.phpt +++ b/ext/tidy/tests/004.phpt @@ -4,14 +4,28 @@ tidy_diagnose() --FILE-- "); - tidy_diagnose($a); - echo tidy_get_error_buffer($a); +$a = tidy_parse_string(''); +var_dump(tidy_diagnose($a)); +echo tidy_get_error_buffer($a); + +$html = <<< HTML + + +foo +

hello

+ +HTML; +$a = tidy_parse_string($html); +var_dump(tidy_diagnose($a)); +echo tidy_get_error_buffer($a); ?> --EXPECT-- - +bool(true) line 1 column 1 - Warning: missing declaration line 1 column 7 - Warning: discarding unexpected line 1 column 14 - Warning: inserting missing 'title' element Info: Document content looks like HTML 3.2 -3 warnings, 0 errors were found! \ No newline at end of file +3 warnings, 0 errors were found! +bool(true) +Info: Document content looks like HTML 3.2 +No warnings or errors were found. diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 50a0f3f2b9..55c33825d4 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -1336,7 +1336,7 @@ static PHP_FUNCTION(tidy_diagnose) { TIDY_FETCH_OBJECT; - if (tidyStatus(obj->ptdoc->doc) != 0 && tidyRunDiagnostics(obj->ptdoc->doc) >= 0) { + if (tidyRunDiagnostics(obj->ptdoc->doc) >= 0) { tidy_doc_update_properties(obj TSRMLS_CC); RETURN_TRUE; } -- cgit v1.2.1