1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00

Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle

This commit is contained in:
Dan Poltawski 2016-06-07 12:12:28 +01:00
commit db417025d7

@ -5466,11 +5466,9 @@ class assign {
* @param int $updatetime
* @return void
*/
public function send_notification($userfrom,
$userto,
$messagetype,
$eventtype,
$updatetime) {
public function send_notification($userfrom, $userto, $messagetype, $eventtype, $updatetime) {
global $USER;
$uniqueid = $this->get_uniqueid_for_user(core_user::is_real_user($userfrom->id) ? $userfrom->id : $USER->id);
self::send_assignment_notification($userfrom,
$userto,
$messagetype,
@ -5482,7 +5480,7 @@ class assign {
$this->get_module_name(),
$this->get_instance()->name,
$this->is_blind_marking(),
$this->get_uniqueid_for_user($userfrom->id));
$uniqueid);
}
/**