Merge branch 'MDL-72834-master' of https://github.com/HuongNV13/moodle

This commit is contained in:
Sara Arjona
2021-12-01 08:59:47 +01:00
10 changed files with 29 additions and 45 deletions
-14
View File
@@ -2945,20 +2945,6 @@ class global_navigation extends navigation_node {
self::TYPE_SETTING, null, 'search');
}
if ($navoptions->calendar) {
$courseid = $COURSE->id;
$params = array('view' => 'month');
if ($courseid != $SITE->id) {
$params['course'] = $courseid;
}
// Calendar
$calendarurl = new moodle_url('/calendar/view.php', $params);
$node = $coursenode->add(get_string('calendar', 'calendar'), $calendarurl,
self::TYPE_CUSTOM, null, 'calendar', new pix_icon('i/calendar', ''));
$node->showinflatnavigation = true;
}
if (isloggedin()) {
$usercontext = context_user::instance($USER->id);
if (has_capability('moodle/user:manageownfiles', $usercontext)) {