L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-47162 core_message: Updating all uses of messaging to add courseid

Browse Source
This commit is contained in:
Eric Merrill
2016-10-31 14:13:13 -04:00
parent a29bcf7819
commit 880fc15bf0
18 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/lib.php
+4 -2
View File
@@ -2636,7 +2636,7 @@ class course_request {
$a = new stdClass();
$a->name = format_string($course->fullname, true, array('context' => context_course::instance($course->id)));
$a->url = $CFG->wwwroot.'/course/view.php?id=' . $course->id;
$this->notify($user, $USER, 'courserequestapproved', get_string('courseapprovedsubject'), get_string('courseapprovedemail2', 'moodle', $a));
$this->notify($user, $USER, 'courserequestapproved', get_string('courseapprovedsubject'), get_string('courseapprovedemail2', 'moodle', $a), $course->id);
return $course->id;
}
@@ -2672,9 +2672,11 @@ class course_request {
* @param string $name
* @param string $subject
* @param string $message
* @param int|null $courseid
*/
protected function notify($touser, $fromuser, $name='courserequested', $subject, $message) {
protected function notify($touser, $fromuser, $name='courserequested', $subject, $message, $courseid = null) {
$eventdata = new \core\message\message();
$eventdata->courseid = empty($courseid) ? SITEID : $courseid;
$eventdata->component = 'moodle';
$eventdata->name = $name;
$eventdata->userfrom = $fromuser;