Merge branch 'MDL-32665_chat_popup_23' of git://github.com/andyjdavis/moodle into...
authorAparup Banerjee <aparup@moodle.com>
Mon, 23 Jul 2012 02:21:44 +0000 (10:21 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 23 Jul 2012 02:21:44 +0000 (10:21 +0800)
mod/chat/gui_ajax/index.php
mod/chat/gui_basic/index.php

index 6955693..db7f340 100644 (file)
@@ -11,6 +11,7 @@ if ($groupid !== 0) {
     $url->param('groupid', $groupid);
 }
 $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);
 $course = $DB->get_record('course', array('id'=>$chat->course), '*', MUST_EXIST);
index 82e02cb..aa79bd5 100644 (file)
@@ -44,6 +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
 
 /// Check to see if groups are being used here
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used