From 1c2a11fcfa5dada13579f464381929d173a5c0ad Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 5 Nov 2015 15:51:42 +0000
Subject: [PATCH 1/2] MDL-46049 chat: add missing closing parenthesis

---
 mod/chat/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 848fd47d21c..6649eb11f1a 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -1265,7 +1265,7 @@ function chat_extend_settings_navigation(settings_navigation $settings, navigati
     if ($chat->chattime && $chat->schedule) {
         $nextsessionnode = $chatnode->add(get_string('nextsession', 'chat').
                                           ': '.userdate($chat->chattime).
-                                          ' ('.usertimezone($USER->timezone));
+                                          ' ('.usertimezone($USER->timezone).')');
         $nextsessionnode->add_class('note');
     }
 

From 600b8152791116d910bfa62a49070fd3469b5f7d Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 5 Nov 2015 15:54:17 +0000
Subject: [PATCH 2/2] MDL-46049 chat: update calendar times on repeating chat
 sessions

Previously were using the invalid chat id and the calendar entry was not
updated.

Thanks to Andy McGill who worked this out.
---
 mod/chat/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 6649eb11f1a..14b8c30df34 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -634,7 +634,7 @@ function chat_update_chat_times($chatid=0) {
         $event = new stdClass(); // Update calendar too.
 
         $cond = "modulename='chat' AND instance = :chatid AND timestart <> :chattime";
-        $params = array('chattime' => $chat->chattime, 'chatid' => $chatid);
+        $params = array('chattime' => $chat->chattime, 'chatid' => $chat->id);
 
         if ($event->id = $DB->get_field_select('event', 'id', $cond, $params)) {
             $event->timestart   = $chat->chattime;