Merge branch 'MDL-61375_master' of git://github.com/markn86/moodle

moodle · Feb 12, 2018 · 0abe3fe3738522c5b645d9fd8b9dcbdaa82c1008 · 0abe3fe
2 parents 755310c + fb77b89
commit 0abe3fe3738522c5b645d9fd8b9dcbdaa82c1008
Unified Split

Showing with 4 additions and 2 deletions.

+4 −2 mod/chat/lib.php
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
@@ -160,7 +160,8 @@ function chat_update_instance($chat) {

    $event = new stdClass();

-    if ($event->id = $DB->get_field('event', 'id', array('modulename' => 'chat', 'instance' => $chat->id))) {
+    if ($event->id = $DB->get_field('event', 'id', array('modulename' => 'chat',
+        'instance' => $chat->id, 'eventtype' => CHAT_EVENT_TYPE_CHATTIME))) {

        if ($chat->schedule > 0) {
            $event->type        = CALENDAR_EVENT_TYPE_ACTION;
@@ -494,7 +495,8 @@ function chat_prepare_update_events($chat, $cm = null) {
    $event->description = format_module_intro('chat', $chat, $cm->id);
    $event->timestart   = $chat->chattime;
    $event->timesort    = $chat->chattime;
-    if ($event->id = $DB->get_field('event', 'id', array('modulename' => 'chat', 'instance' => $chat->id))) {
+    if ($event->id = $DB->get_field('event', 'id', array('modulename' => 'chat', 'instance' => $chat->id,
+            'eventtype' => CHAT_EVENT_TYPE_CHATTIME))) {
        $calendarevent = calendar_event::load($event->id);
        $calendarevent->update($event);
    } else if ($chat->schedule > 0) {