mirror of
https://github.com/moodle/moodle.git
synced 2025-05-02 14:28:30 +02:00
Merge branch 'MDL-32665_chat_popup' of git://github.com/andyjdavis/moodle
This commit is contained in:
commit
d829f5c6fd
@ -11,6 +11,7 @@ if ($groupid !== 0) {
|
|||||||
$url->param('groupid', $groupid);
|
$url->param('groupid', $groupid);
|
||||||
}
|
}
|
||||||
$PAGE->set_url($url);
|
$PAGE->set_url($url);
|
||||||
|
$PAGE->set_popup_notification_allowed(false); // No popup notifications in the chat window
|
||||||
|
|
||||||
$chat = $DB->get_record('chat', array('id'=>$id), '*', MUST_EXIST);
|
$chat = $DB->get_record('chat', array('id'=>$id), '*', MUST_EXIST);
|
||||||
$course = $DB->get_record('course', array('id'=>$chat->course), '*', MUST_EXIST);
|
$course = $DB->get_record('course', array('id'=>$chat->course), '*', MUST_EXIST);
|
||||||
|
@ -44,6 +44,7 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
|
|||||||
require_login($course, false, $cm);
|
require_login($course, false, $cm);
|
||||||
require_capability('mod/chat:chat', $context);
|
require_capability('mod/chat:chat', $context);
|
||||||
$PAGE->set_pagelayout('base');
|
$PAGE->set_pagelayout('base');
|
||||||
|
$PAGE->set_popup_notification_allowed(false); // No popup notifications in the chat window
|
||||||
|
|
||||||
/// Check to see if groups are being used here
|
/// Check to see if groups are being used here
|
||||||
if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
|
if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
|
||||||
|
Loading…
x
Reference in New Issue
Block a user