Merge branch 'MDL-53012-m30' of https://github.com/sammarshallou/moodle into MOODLE_30_STABLE

2016-02-16 10:44:58 +00:00
parent e7a4135526 4ff024c5ab
commit db57772b2f
3 changed files with 65 additions and 11 deletions
@@ -8404,7 +8404,7 @@ function address_in_subnet($addr, $subnetstr) {
 */
 function mtrace($string, $eol="\n", $sleep=0) {

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