Merged latest tweaks

diff --git a/lib/defaults.php b/lib/defaults.php
index 288c9b007a0f91050db6f5f6335e87d2abf2af7c..3a170e02e6a6eb2a16cc4150fd087c6d6fec8056 100644 (file)
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -4,7 +4,8 @@
 // It defines default values for any important configuration variables
 
    $defaults = array (
-       "auth"                     => "email",
+       "auth"                     => 'email',
+       "auth_pop3mailbox"         => 'INBOX',
        "autologinguests"          => 0,
        "allowunenroll"            =>  true,
        "cachetext"                =>  60,

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 752c0ebefee84fd4843021d9b256ee123b22557b..bcab55334fb0082fce3f7bb4cdb7fadcb9d6b8bd 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1532,7 +1532,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml="", $a
     if ($mail->Send()) {
         return true;
     } else {
-        echo "ERROR: $mail->ErrorInfo\n";
+        mtrace("ERROR: $mail->ErrorInfo");
         $site = get_site();
         add_to_log($site->id, "library", "mailer", $_SERVER["REQUEST_URI"], "ERROR: $mail->ErrorInfo");
         return false;