diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 773fda59a..c8eb57206 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -60,6 +60,7 @@ - fix: Collab System FAQ: clicking top link does not bring you back to the top of FAQ (perlDreamer Consulting, LLC) - fix: SQL Report download template (perlDreamer Consulting, LLC) - fix: Ignoring shortcut overrides. + - fix: Calendar feeds not working. 7.3.8 - Fixed a template variable rewriting problem with HTML::Template::Expr diff --git a/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm b/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm index 46f42a480..d7b755b83 100755 --- a/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm +++ b/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm @@ -213,7 +213,7 @@ sub execute { my ($hour, $minute, $second) = $time =~ /(\d{2})(\d{2})(\d{2})/; ($properties->{startDate}, $properties->{startTime}) = - split / /, WebGUI::DateTime( + split / /, WebGUI::DateTime->new( year => $year, month => $month, day => $day, @@ -239,7 +239,7 @@ sub execute { my ($hour, $minute, $second) = $time =~ /(\d{2})(\d{2})(\d{2})/; ($properties->{endDate}, $properties->{endTime}) = - split / /, WebGUI::DateTime( + split / /, WebGUI::DateTime->new( year => $year, month => $month, day => $day, @@ -302,6 +302,10 @@ sub execute { else { my $calendar = WebGUI::Asset->newByDynamicClass($self->session,$feed->{assetId}); + if (!defined $calendar) { + $self->session->errorHandler->error("CalendarUpdateFeeds Activity: Calendar object failed to instanciate at line 304. Did you commit the calendar wobject?"); + return $self->ERROR; + } my $event = $calendar->addChild($properties); $event->requestAutoCommit; $added++;