Merge branch 'MDL-33359' of git://github.com/danpoltawski/moodle

2012-05-28 21:25:01 +02:00
parent 6bea694b6c 4ad85bd857
commit b3520a4ae7
1 changed files with 1 additions and 1 deletions
@@ -9642,7 +9642,7 @@ function address_in_subnet($addr, $subnetstr) {
 */
 function mtrace($string, $eol="\n", $sleep=0) {

-    if (defined('STDOUT')) {
+    if (defined('STDOUT') and !PHPUNIT_TEST) {
        fwrite(STDOUT, $string.$eol);
    } else {
        echo $string . $eol;