L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2013-01-31 08:45:32 +13:00
parent 2cc9648555 db30e0b00a
commit 07f3c79dd4
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/edit.php
-1
View File
@@ -45,7 +45,6 @@ if (!$user = $DB->get_record('user', array('id' => $userid))) {
$systemcontext = get_context_instance(CONTEXT_SYSTEM);
$personalcontext = get_context_instance(CONTEXT_USER, $user->id);
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
$PAGE->set_context($personalcontext);
$PAGE->set_pagelayout('course');
message/index.php
-6
View File
@@ -83,18 +83,12 @@ if ($viewing != MESSAGE_VIEW_UNREAD_MESSAGES) {
$PAGE->set_url($url);
$PAGE->set_context(get_context_instance(CONTEXT_USER, $USER->id));
$PAGE->navigation->extend_for_user($USER);
$PAGE->set_pagelayout('course');
$navigationurl = new moodle_url('/message/index.php', array('user1' => $user1id));
navigation_node::override_active_url($navigationurl);
// Disable message notification popups while the user is viewing their messages
$PAGE->set_popup_notification_allowed(false);
//$context = get_context_instance(CONTEXT_SYSTEM);
$user1 = null;
$currentuser = true;
$showactionlinks = true;