Merge branch 'wip-mdl-45416' of https://github.com/rajeshtaneja/moodle

2014-11-06 00:57:45 +01:00
parent ec070d2cf7 e790a3ecc7
commit a376c72a05
1 changed files with 5 additions and 1 deletions
@@ -146,7 +146,11 @@ class enrol_ldap_plugin extends enrol_plugin {
        global $DB;

        // Do not try to print anything to the output because this method is called during interactive login.
-        $trace = new error_log_progress_trace($this->errorlogtag);
+        if (PHPUNIT_TEST) {
+            $trace = new null_progress_trace();
+        } else {
+            $trace = new error_log_progress_trace($this->errorlogtag);
+        }

        if (!$this->ldap_connect($trace)) {
            $trace->finished();