moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dan Poltawski 2012-10-16 13:47:46 +08:00
commit d2936c2642
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
message/edit.php
View file

@ -34,6 +34,7 @@ $url->param('id', $userid);
$url->param('course', $course); $url->param('course', $course);
$PAGE->set_url($url); $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))) { if (!$course = $DB->get_record('course', array('id' => $course))) {
print_error('invalidcourseid'); print_error('invalidcourseid');

6
message/lib.php
View file

@ -26,12 +26,6 @@ require_once($CFG->libdir.'/eventslib.php');
define ('MESSAGE_SHORTLENGTH', 300); 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_WIDTH',600);
define ('MESSAGE_DISCUSSION_HEIGHT',500); define ('MESSAGE_DISCUSSION_HEIGHT',500);