Permalink
Browse files

Merge branch 'message_nav_23' of git://github.com/andyjdavis/moodle i…

…nto MOODLE_23_STABLE
  • Loading branch information...
2 parents 5b2b3bd + b4a8ab2 commit 532577bb97a8b31f53f8dc792598a9a727d0afff Sam Hemelryk committed Dec 9, 2012
Showing with 5 additions and 31 deletions.
  1. +1 −1 lib/navigationlib.php
  2. +4 −30 message/edit.php
View
2 lib/navigationlib.php
@@ -4194,7 +4194,7 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr
// Messaging
if (($currentuser && has_capability('moodle/user:editownmessageprofile', $systemcontext)) || (!isguestuser($user) && has_capability('moodle/user:editmessageprofile', $usercontext) && !is_primary_admin($user->id))) {
- $url = new moodle_url('/message/edit.php', array('id'=>$user->id, 'course'=>$course->id));
+ $url = new moodle_url('/message/edit.php', array('id'=>$user->id));
$usersetting->add(get_string('editmymessage', 'message'), $url, self::TYPE_SETTING);
}
View
34 message/edit.php
@@ -26,30 +26,14 @@
require_once($CFG->dirroot . '/message/lib.php');
$userid = optional_param('id', $USER->id, PARAM_INT); // user id
-$course = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site)
$disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications
$url = new moodle_url('/message/edit.php');
$url->param('id', $userid);
-$url->param('course', $course);
$PAGE->set_url($url);
-if (!$course = $DB->get_record('course', array('id' => $course))) {
- print_error('invalidcourseid');
-}
-
-if ($course->id != SITEID) {
- require_login($course);
-
-} else {
- if (!isloggedin()) {
- if (empty($SESSION->wantsurl)) {
- $SESSION->wantsurl = $CFG->httpswwwroot.'/message/edit.php';
- }
- redirect(get_login_url());
- }
-}
+require_login();
if (isguestuser()) {
print_error('guestnoeditmessage', 'message');
@@ -71,10 +55,6 @@
if ($user->id == $USER->id) {
//editing own message profile
require_capability('moodle/user:editownmessageprofile', $systemcontext);
- if ($course->id != SITEID && $node = $PAGE->navigation->find($course->id, navigation_node::TYPE_COURSE)) {
- $node->make_active();
- $PAGE->navbar->includesettingsbase = true;
- }
} else {
// teachers, parents, etc.
require_capability('moodle/user:editmessageprofile', $personalcontext);
@@ -144,7 +124,7 @@
print_error('cannotupdateusermsgpref');
}
- redirect("$CFG->wwwroot/message/edit.php?id=$user->id&course=$course->id");
+ redirect("$CFG->wwwroot/message/edit.php?id=$user->id");
}
/// Load preferences
@@ -179,14 +159,8 @@
/// Display page header
$streditmymessage = get_string('editmymessage', 'message');
-$strparticipants = get_string('participants');
-
-$PAGE->set_title("$course->shortname: $streditmymessage");
-if ($course->id != SITEID) {
- $PAGE->set_heading("$course->fullname: $streditmymessage");
-} else {
- $PAGE->set_heading($course->fullname);
-}
+$PAGE->set_title($streditmymessage);
+$PAGE->set_heading($streditmymessage);
// Grab the renderer
$renderer = $PAGE->get_renderer('core', 'message');

0 comments on commit 532577b

Please sign in to comment.