diff options
| author | Nuno Lopes <nlopess@php.net> | 2012-01-21 11:32:56 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2012-01-21 11:32:56 +0000 |
| commit | e718c53223da5e812190d2794f18bd1f4c6b121d (patch) | |
| tree | ae51dd4915cd7aa66927fa5e175fafe2b0a3aff8 /ext/tidy | |
| parent | 3299a2673cceeb1cefc4c064f2a248edfeba8509 (diff) | |
| download | php-git-e718c53223da5e812190d2794f18bd1f4c6b121d.tar.gz | |
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
Diffstat (limited to 'ext/tidy')
| -rw-r--r-- | ext/tidy/tests/004.phpt | 24 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 2 |
2 files changed, 20 insertions, 6 deletions
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() <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $a = tidy_parse_string("<HTML></HTML>"); - tidy_diagnose($a); - echo tidy_get_error_buffer($a); +$a = tidy_parse_string('<HTML></HTML>'); +var_dump(tidy_diagnose($a)); +echo tidy_get_error_buffer($a); + +$html = <<< HTML +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<html> +<head><title>foo</title></head> +<body><p>hello</p></body> +</html> +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 <!DOCTYPE> declaration line 1 column 7 - Warning: discarding unexpected </html> 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; } |