From 0fac75759e52a8f435cca744c687c8cb2baa4ab3 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 21 May 2010 19:26:55 -0700 Subject: [PATCH] Actually build an array of items in getRssFeedItems. Fix several method modifiers. --- lib/WebGUI/Asset/Wobject/SyndicatedContent.pm | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm index d791d4869..785bc5d79 100644 --- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm @@ -217,6 +217,7 @@ sub getRssFeedItems { author => $item->author, guid => $item->guid, ); + push @items, \%feed_item; } return \@items; } @@ -294,11 +295,12 @@ See WebGUI::Asset::prepareView() for details. =cut -sub prepareView { +around prepareView => sub { + my $orig = shift; my $self = shift; - $self->next::method; - my $template = WebGUI::Asset::Template->newById($self->session, $self->templateId); - if (!$template) { + $self->$orig(); + my $template = eval { WebGUI::Asset->newById($self->session, $self->templateId); }; + if (Exception::Class->caught()) { WebGUI::Error::ObjectNotFound::Template->throw( error => qq{Template not found}, templateId => $self->templateId, @@ -307,7 +309,7 @@ sub prepareView { } $template->prepare($self->getMetaDataAsTemplateVariables); $self->{_viewTemplate} = $template; -} +}; #------------------------------------------------------------------- @@ -359,11 +361,11 @@ See WebGUI::Asset::Wobject::www_view() for details. =cut -sub www_view { - my $self = shift; - $self->session->http->setCacheControl($self->cacheTimeout); - $self->next::method(@_); -} +override www_view => sub { + my $self = shift; + $self->session->http->setCacheControl($self->cacheTimeout); + super(); +}; __PACKAGE__->meta->make_immutable; 1;