Merge branch 'MDL-34367_message_lib' of git://github.com/andyjdavis/m…

…oodle
UniGe · Oct 16, 2012 · d2936c2 · d2936c2
2 parents 9b0a3e1 + 26e02d7
commit d2936c2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/message/edit.php b/message/edit.php
@@ -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');

diff --git a/message/lib.php b/message/lib.php
@@ -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);