Merge branch 'message_nav' of git://github.com/andyjdavis/moodle

This commit is contained in:
Sam Hemelryk 2012-12-10 11:00:17 +13:00
commit fa9b53cdf8
3 changed files with 7 additions and 34 deletions

View file

@ -3978,8 +3978,8 @@ class settings_navigation extends navigation_node {
// 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));
$usersetting->add(get_string('editmymessage', 'message'), $url, self::TYPE_SETTING);
$url = new moodle_url('/message/edit.php', array('id'=>$user->id));
$usersetting->add(get_string('messaging', 'message'), $url, self::TYPE_SETTING);
}
// Blogs