Merge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 13:08:32 +0000 (14:08 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 13:08:32 +0000 (14:08 +0100)
mod/chat/gui_basic/index.php
mod/chat/gui_header_js/chatinput.php
mod/chat/gui_header_js/users.php
mod/chat/gui_sockets/chatinput.php

index aa79bd5..e645b06 100644 (file)
@@ -44,7 +44,7 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_login($course, false, $cm);
 require_capability('mod/chat:chat', $context);
 $PAGE->set_pagelayout('base');
-$PAGE->set_popup_notification_allowed(false); // No popup notifications in the chat window
+$PAGE->set_popup_notification_allowed(false);
 
 /// Check to see if groups are being used here
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used
index 02545f5..9568534 100644 (file)
@@ -24,6 +24,7 @@ if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) {
 }
 
 $PAGE->set_url('/mod/chat/gui_header_js/chatinput.php', array('chat_sid'=>$chat_sid, 'chat_id'=>$chatid));
+$PAGE->set_popup_notification_allowed(false);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
index 246417c..29dc041 100644 (file)
@@ -9,6 +9,7 @@ $chat_sid   = required_param('chat_sid', PARAM_ALPHANUM);
 $beep       = optional_param('beep', 0, PARAM_INT);  // beep target
 
 $PAGE->set_url('/mod/chat/gui_header_js/users.php', array('chat_sid'=>$chat_sid));
+$PAGE->set_popup_notification_allowed(false);
 
 if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
     print_error('notlogged', 'chat');
index d0603c2..8a9d864 100644 (file)
@@ -8,6 +8,7 @@ require('../lib.php');
 $chat_sid = required_param('chat_sid', PARAM_ALPHANUM);
 
 $PAGE->set_url('/mod/chat/gui_sockets/chatinput.php', array('chat_sid'=>$chat_sid));
+$PAGE->set_popup_notification_allowed(false);
 
 if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
     print_error('notlogged', 'chat');