diff --git a/NEWS b/NEWS index acc5dcaa..35b09fd1 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier the other involving an undefined $is_folder error. - Throw error when %Core.Encoding is set to a spurious value. Previously, this errored silently and returned false. +- Redirected stderr to stdout for flush error output. . Strategy_MakeWellFormed now operates in-place, saving memory and allowing for more interesting filter-backtracking . New HTMLPurifier_Injector->rewind() functionality, allows injectors to rewind diff --git a/tests/common.php b/tests/common.php index 60ff87cd..1e6890d4 100644 --- a/tests/common.php +++ b/tests/common.php @@ -201,7 +201,7 @@ class FailedTest extends UnitTestCase { * Flushes all caches, and fatally errors out if there's a problem. */ function htmlpurifier_flush($php, $reporter) { - exec($php . ' ../maintenance/flush.php ' . $php, $out, $status); + exec($php . ' ../maintenance/flush.php ' . $php . ' 2>&1', $out, $status); if ($status) { $test = new FailedTest( 'maintenance/flush.php returned non-zero exit status',