Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle

blocks/calendar_month/block_calendar_month.php

@@ -51,7 +51,7 @@ class block_calendar_month extends block_base {
         $courseid = $this->page->course->id;
         $categoryid = ($this->page->context->contextlevel === CONTEXT_COURSECAT) ? $this->page->category->id : null;
         $calendar = \calendar_information::create(time(), $courseid, $categoryid);
-        list($data, $template) = calendar_get_view($calendar, 'mini');
+        list($data, $template) = calendar_get_view($calendar, 'mini', isloggedin());
 
         $renderer = $this->page->get_renderer('core_calendar');
         $this->content->text .= $renderer->render_from_template($template, $data);

calendar/classes/external/calendar_upcoming_exporter.php

@@ -87,6 +87,9 @@ class calendar_upcoming_exporter extends exporter {
                 'optional' => true,
                 'default' => 0,
             ],
+            'isloggedin' => [
+                'type' => PARAM_BOOL,
+            ],
         ];
     }
 
@@ -106,6 +109,7 @@ class calendar_upcoming_exporter extends exporter {
             'course' => $this->calendar->course->id,
         ]);
         $this->url = $url;
+        $return['isloggedin'] = isloggedin();
         $return['events'] = array_map(function($event) use ($cache, $output, $url) {
             $context = $cache->get_context($event);
             $course = $cache->get_course($event);

calendar/templates/calendar_upcoming_mini.mustache

@@ -34,8 +34,10 @@
 <div id="calendar-upcoming-block-{{uniqid}}" data-template="core_calendar/upcoming_mini">
     {{> core_calendar/upcoming_mini}}
 </div>
+{{#isloggedin}}
 {{#js}}
 require(['jquery', 'core_calendar/calendar_view'], function($, CalendarView) {
     CalendarView.init($("#calendar-upcoming-block-{{uniqid}}"), 'upcoming');
 });
 {{/js}}
+{{/isloggedin}}