Merge branch 'MDL-72106' of https://github.com/paulholden/moodle

diff --cc calendar/managesubscriptions.php
index 2d2ca7a,6118a4e..1410bd3
--- 1/calendar/managesubscriptions.php
--- 2/calendar/managesubscriptions.php
+++ b/calendar/managesubscriptions.php
@@@ -74,10 -61,6 +72,8 @@@ if (!calendar_user_can_add_event($cours
      print_error('errorcannotimport', 'calendar');
  }
  
- $importresults = '';
- 
 +$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'));
 +
  if (!empty($subscriptionid)) {
      // The user is wanting to perform an action upon an existing subscription.
      require_sesskey(); // Must have sesskey for all actions.