Permalink
Browse files

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

…e into MOODLE_24_STABLE
  • Loading branch information...
2 parents a1ffe7e + 9ffffa5 commit fb0698f3444460f75043b246d3de5cbf198dfc44 @danpoltawski danpoltawski committed Apr 30, 2013
@@ -44,7 +44,7 @@
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
@@ -24,6 +24,7 @@
}
$PAGE->set_url('/mod/chat/gui_header_js/chatinput.php', array('chat_sid'=>$chat_sid, 'chat_id'=>$chatid));
+$PAGE->set_popup_notification_allowed(false);
//Get the user theme
$USER = $DB->get_record('user', array('id'=>$chatuser->userid));
@@ -9,6 +9,7 @@
$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');
@@ -8,6 +8,7 @@
$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');

0 comments on commit fb0698f

Please sign in to comment.