Permalink
Browse files

MDL-34367 core_message: removed the call to $PAGE->set_popup_notifica…

…tion_allowed from message/lib.php
  • Loading branch information...
1 parent 5d6285c commit 26e02d7586b57c8436d007fbe3705025dd10416d @andyjdavis andyjdavis committed Oct 1, 2012
Showing with 1 addition and 6 deletions.
  1. +1 −0 message/edit.php
  2. +0 −6 message/lib.php
View
@@ -34,6 +34,7 @@
$url->param('course', $course);
$PAGE->set_url($url);
+$PAGE->set_popup_notification_allowed(false); // We are within the messaging system so don't show message popups
if (!$course = $DB->get_record('course', array('id' => $course))) {
print_error('invalidcourseid');
View
@@ -26,12 +26,6 @@
define ('MESSAGE_SHORTLENGTH', 300);
-//$PAGE isnt set if we're being loaded by cron which doesnt display popups anyway
-if (isset($PAGE)) {
- //TODO: this is a mega crazy hack - it is not acceptable to call anything when including lib!!! (skodak)
- $PAGE->set_popup_notification_allowed(false); // We are in a message window (so don't pop up a new one)
-}
-
define ('MESSAGE_DISCUSSION_WIDTH',600);
define ('MESSAGE_DISCUSSION_HEIGHT',500);

0 comments on commit 26e02d7

Please sign in to comment.