mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 00:12:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47805-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2014-10-29 14:46:06 +08:00
commit 412430c392
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/tool/monitor/classes/notification_task.php
View File

@ -45,7 +45,9 @@ class notification_task extends \core\task\adhoc_task {
$subscriptionids = $data->subscriptionids;
foreach ($subscriptionids as $id) {
if ($message = $this->generate_message($id, $eventobj)) {
mtrace("Sending message to the user with id " . $message->userto->id . " for the subscription with id $id...");
message_send($message);
mtrace("Sent.");
}
}
}
@ -68,6 +70,10 @@ class notification_task extends \core\task\adhoc_task {
return false;
}
$user = \core_user::get_user($subscription->userid);
if (empty($user)) {
// User doesn't exist. Should never happen, nothing to do return.
return false;
}
$context = \context_user::instance($user->id, IGNORE_MISSING);
if ($context === false) {
// User context doesn't exist. Should never happen, nothing to do return.

2
admin/tool/monitor/tests/eventobservers_test.php
View File

@ -270,10 +270,12 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
* Run adhoc tasks.
*/
protected function run_adhock_tasks() {
ob_start();
while ($task = \core\task\manager::get_next_adhoc_task(time())) {
$task->execute();
\core\task\manager::adhoc_task_complete($task);
}
ob_clean(); // Suppress mtrace debugging info.
}
/**