Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodl…

…e into MOODLE_23_STABLE
  • Loading branch information...
commit cfbf324052bf9c18fd37e1f59fe1b64536a3d3b3 2 parents ff6479d + fa15dda
Dan Poltawski authored
2  mod/chat/gui_basic/index.php
@@ -44,7 +44,7 @@
44 44
 require_login($course, false, $cm);
45 45
 require_capability('mod/chat:chat', $context);
46 46
 $PAGE->set_pagelayout('base');
47  
-$PAGE->set_popup_notification_allowed(false); // No popup notifications in the chat window
  47
+$PAGE->set_popup_notification_allowed(false);
48 48
 
49 49
 /// Check to see if groups are being used here
50 50
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used
1  mod/chat/gui_header_js/chatinput.php
@@ -24,6 +24,7 @@
24 24
 }
25 25
 
26 26
 $PAGE->set_url('/mod/chat/gui_header_js/chatinput.php', array('chat_sid'=>$chat_sid, 'chat_id'=>$chatid));
  27
+$PAGE->set_popup_notification_allowed(false);
27 28
 
28 29
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
29 30
 
1  mod/chat/gui_header_js/users.php
@@ -9,6 +9,7 @@
9 9
 $beep       = optional_param('beep', 0, PARAM_INT);  // beep target
10 10
 
11 11
 $PAGE->set_url('/mod/chat/gui_header_js/users.php', array('chat_sid'=>$chat_sid));
  12
+$PAGE->set_popup_notification_allowed(false);
12 13
 
13 14
 if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
14 15
     print_error('notlogged', 'chat');
1  mod/chat/gui_sockets/chatinput.php
@@ -8,6 +8,7 @@
8 8
 $chat_sid = required_param('chat_sid', PARAM_ALPHANUM);
9 9
 
10 10
 $PAGE->set_url('/mod/chat/gui_sockets/chatinput.php', array('chat_sid'=>$chat_sid));
  11
+$PAGE->set_popup_notification_allowed(false);
11 12
 
12 13
 if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
13 14
     print_error('notlogged', 'chat');

0 notes on commit cfbf324

Please sign in to comment.
Something went wrong with that request. Please try again.