summaryrefslogtreecommitdiff
path: root/ext/tidy
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-05-21 12:52:10 +0200
committerAnatoliy Belsky <ab@php.net>2012-05-21 12:52:10 +0200
commitfbb86bd7b3c7425a64bb2f76532f937b3a050ea1 (patch)
treef67f350dd897dde03d12c015618a79c32c5a8046 /ext/tidy
parent77e70b391c9aada03c149fe04eb275ee54fb36dc (diff)
parentc973fef48d6302b9bcec898de8e39d8d7e23adef (diff)
downloadphp-git-fbb86bd7b3c7425a64bb2f76532f937b3a050ea1.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
Diffstat (limited to 'ext/tidy')
-rw-r--r--ext/tidy/tests/004.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt
index 7ca17c6d95..d13c37dcd8 100644
--- a/ext/tidy/tests/004.phpt
+++ b/ext/tidy/tests/004.phpt
@@ -6,7 +6,7 @@ tidy_diagnose()
<?php
$a = tidy_parse_string('<HTML></HTML>');
var_dump(tidy_diagnose($a));
-echo tidy_get_error_buffer($a);
+echo str_replace("\r", "", tidy_get_error_buffer($a));
$html = <<< HTML
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">