Merge branch 'MDL-63119-35' of git://github.com/lameze/moodle into MO…

…ODLE_35_STABLE
moodle · Sep 25, 2018 · 7133857 · 7133857
2 parents 5874ac4 + f7035a8
commit 7133857
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/calendar/classes/external/event_exporter.php b/calendar/classes/external/event_exporter.php
@@ -92,6 +92,10 @@ protected function get_other_values(renderer_base $output) {
         }
         $values['url'] = $url->out(false);
 
+        // Override default formatted time to make sure the date portion of the time is always rendered.
+        $legacyevent = container::get_event_mapper()->from_event_to_legacy_event($event);
+        $values['formattedtime'] = calendar_format_event_time($legacyevent, time(), null, false);
+
         if ($event instanceof action_event_interface) {
             $actionrelated = [
                 'context' => $context,

diff --git a/calendar/templates/event_summary_body.mustache b/calendar/templates/event_summary_body.mustache
@@ -41,7 +41,7 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-xs-1">{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}</div>
-            <div class="col-xs-11">{{#userdate}} {{timestart}}, {{#str}} strftimerecentfull {{/str}} {{/userdate}}</div>
+            <div class="col-xs-11">{{{formattedtime}}}</div>
         </div>
         <div class="row m-t-1">
             <div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>