From 5fa4ac4dc1c778a25279887da77c2f728e91bf1f Mon Sep 17 00:00:00 2001 From: Hagen Schink Date: Tue, 3 Dec 2013 14:24:19 +0100 Subject: [PATCH] Fixes MySQL meeting date handling --- app/models/activity/meeting_activity_provider.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/activity/meeting_activity_provider.rb b/app/models/activity/meeting_activity_provider.rb index 443c7b3754..f918180d7f 100644 --- a/app/models/activity/meeting_activity_provider.rb +++ b/app/models/activity/meeting_activity_provider.rb @@ -85,7 +85,7 @@ class Activity::MeetingActivityProvider def self.event_meeting_title(event) start_time = event['meeting_start_time'].is_a?(String) ? DateTime.parse(event['meeting_start_time']) - : start_time + : event['meeting_start_time'] end_time = start_time + event['meeting_duration'].to_f.hours "#{l :label_meeting}: #{event['meeting_title']} (#{format_date start_time} \