MDL-12703 - Use the 'welcometocourse' language string if there is no 'welcomemessage...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 0179378adc46d6333835377626c073a7fbbd188e..39db18df22ac456fe523c2626e0c3f1225399b32 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4283,13 +4283,18 @@ function email_welcome_message_to_user($course, $user=NULL) {
     }
 
     if (!empty($course->welcomemessage)) {
-        $subject = get_string('welcometocourse', '', format_string($course->fullname));
-
+        $message = $course->welcomemessage;
+    } else {
+        $a = new Object();
         $a->coursename = $course->fullname;
         $a->profileurl = "$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id";
-        //$message = get_string("welcometocoursetext", "", $a);
-        $message = $course->welcomemessage;
+        $message = get_string("welcometocoursetext", "", $a);
+    }
 
+    /// If you don't want a welcome message sent, then make the message string blank.
+    if (!empty($message)) {
+        $subject = get_string('welcometocourse', '', format_string($course->fullname));
+    
         if (! $teacher = get_teacher($course->id)) {
             $teacher = get_admin();
         }