From 40b5ac13a4fa23861280730f18ffedce4de2b43d Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 28 Apr 2009 19:51:47 +0000 Subject: [PATCH] Update code to match new RssFeed API w.r.t exporting. --- lib/WebGUI/Asset/Wobject/StoryArchive.pm | 4 ++-- lib/WebGUI/Asset/Wobject/StoryTopic.pm | 4 ++-- t/Asset/Wobject/StoryArchive.t | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm index 4e8991a33..ac2c5fc1d 100644 --- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm +++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm @@ -552,8 +552,8 @@ sub viewTemplateVariables { $var->{addStoryUrl} = $var->{canPostStories} ? $self->getUrl('func=add;class=WebGUI::Asset::Story') : ''; - $var->{rssUrl} = $exporting ? $self->getStaticRssFeedUrl : $self->getRssFeedUrl; - $var->{atomUrl} = $exporting ? $self->getStaticAtomFeedUrl : $self->getAtomFeedUrl; + $var->{rssUrl} = $self->getRssFeedUrl; + $var->{atomUrl} = $self->getAtomFeedUrl; my $cloudOptions = { startAsset => $self, displayFunc => 'view', diff --git a/lib/WebGUI/Asset/Wobject/StoryTopic.pm b/lib/WebGUI/Asset/Wobject/StoryTopic.pm index c9132012a..097fff375 100644 --- a/lib/WebGUI/Asset/Wobject/StoryTopic.pm +++ b/lib/WebGUI/Asset/Wobject/StoryTopic.pm @@ -214,8 +214,8 @@ sub viewTemplateVariables { } } $var->{standAlone} = $self->{_standAlone}; - $var->{rssUrl} = $exporting ? $self->getStaticRssFeedUrl : $self->getRssFeedUrl; - $var->{atomUrl} = $exporting ? $self->getStaticAtomFeedUrl : $self->getAtomFeedUrl; + $var->{rssUrl} = $self->getRssFeedUrl; + $var->{atomUrl} = $self->getAtomFeedUrl; return $var; } diff --git a/t/Asset/Wobject/StoryArchive.t b/t/Asset/Wobject/StoryArchive.t index 1fcad7ad6..b7e8ed6aa 100644 --- a/t/Asset/Wobject/StoryArchive.t +++ b/t/Asset/Wobject/StoryArchive.t @@ -541,6 +541,7 @@ cmp_bag( [qw/ mystories.rss mystories mystories.atom + mystories.rdf /], 'exportAssetCollateral: feed files exported' );