Merge branch 'MDL-74154-master' of https://github.com/peterRd/moodle

enovation · Mar 16, 2022 · ff40271 · ff40271
2 parents dd7d03a + 8802254
commit ff40271
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/calendar/delete.php b/calendar/delete.php
@@ -94,6 +94,7 @@
 $PAGE->navbar->add($title);
 $PAGE->set_title($site->shortname.': '.$strcalendar.': '.$title);
 $PAGE->set_heading($COURSE->fullname);
+$PAGE->has_secondary_navigation_setter(false);
 echo $OUTPUT->header();
 echo $OUTPUT->box_start('eventlist');
 

diff --git a/calendar/event.php b/calendar/event.php
@@ -193,7 +193,7 @@
 $PAGE->navbar->add($title);
 $PAGE->set_title($course->shortname.': '.$strcalendar.': '.$title);
 $PAGE->set_heading($course->fullname);
-
+$PAGE->has_secondary_navigation_setter(false);
 $renderer = $PAGE->get_renderer('core_calendar');
 $calendar->add_sidecalendar_blocks($renderer);
 

diff --git a/calendar/export.php b/calendar/export.php
@@ -131,6 +131,7 @@
 $PAGE->set_title($course->shortname.': '.get_string('calendar', 'calendar').': '.$pagetitle);
 $PAGE->set_heading($headingstr);
 $PAGE->set_pagelayout('standard');
+$PAGE->has_secondary_navigation_setter(false);
 
 $renderer = $PAGE->get_renderer('core_calendar');
 $calendar->add_sidecalendar_blocks($renderer);

diff --git a/calendar/import.php b/calendar/import.php
@@ -69,6 +69,7 @@
 $heading = get_string('importcalendar', 'calendar');
 $pagetitle = $course->shortname . ': ' . get_string('calendar', 'calendar') . ': ' . $heading;
 
+$PAGE->has_secondary_navigation_setter(false);
 $PAGE->set_title($pagetitle);
 $PAGE->set_heading($heading);
 $PAGE->set_url($pageurl);

diff --git a/calendar/managesubscriptions.php b/calendar/managesubscriptions.php
@@ -53,6 +53,7 @@
 
 $PAGE->set_url($url);
 $PAGE->set_pagelayout('admin');
+$PAGE->has_secondary_navigation_setter(false);
 
 if ($courseid != SITEID && !empty($courseid)) {
     // Course ID must be valid and existing.

diff --git a/calendar/view.php b/calendar/view.php
@@ -111,6 +111,7 @@
 } else {
     $PAGE->set_context(context_system::instance());
 }
+$PAGE->has_secondary_navigation_setter(false);
 
 require_login($course, false);