MDL-20695 do not use trigger_error together with echo, it just duplicates info when...

diff --git a/enrol/enrol.class.php b/enrol/enrol.class.php
index 50e719efa7a9e1a75ad598657d3d9e03665cf717..8ff8afd60503366654a87d7e061960d54f8fdecb 100644 (file)
--- a/enrol/enrol.class.php
+++ b/enrol/enrol.class.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 /**
 * enrolment_factory is used to "manufacture" an instance of required enrolment plugin.
@@ -15,10 +15,8 @@ class enrolment_factory {
             $class = "enrolment_plugin_$enrol";
             return new $class;
         } else {
-            trigger_error("$CFG->dirroot/enrol/$enrol/enrol.php does not exist");
+            error_log("$CFG->dirroot/enrol/$enrol/enrol.php does not exist");
             echo $OUTPUT->notification("Enrolment file $enrol/enrol.php does not exist");
         }
     }
 }
-
-?>

diff --git a/enrol/ldap/enrol.php b/enrol/ldap/enrol.php
index a886d5663d33570421adf68bb466e90478d10d54..7a1d6e815bc0eae8a68ee52c6d1bea189c683558 100755 (executable)
--- a/enrol/ldap/enrol.php
+++ b/enrol/ldap/enrol.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 require_once("$CFG->dirroot/enrol/enrol.class.php");
 
@@ -431,7 +431,7 @@ function enrol_ldap_connect(){
                                  $CFG->enrol_ldap_bind_pw );
             if (!$bind) {
                 echo $OUTPUT->notification("Error in binding to LDAP server");
-                trigger_error("Error in binding to LDAP server $!");
+                error_log("Error in binding to LDAP server $!");
             }
 
         }
@@ -655,4 +655,3 @@ function check_legacy_config () {
 
 } // end of class
 
-?>