From 6126bf0fd78bed197ee7e6145dfb1765ebfef615 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Fri, 25 Jul 2008 04:03:16 +0000 Subject: [PATCH] fixed: Collaboration system includes header link even with RSS turned off --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/Collaboration.pm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 2d3a5f4d3..9c0e19d25 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.5.18 + - fixed: Collaboration system includes header link even with RSS turned off - fixed: edit branch doesn't show list style metadata fields properly - fixed: Product no longer shows "Continue Shopping" view when a different user adds the Product to their Cart. The issue was the Product cached itself when an item was added to the cart. Now it checks for if a cart asset exists for this session. - fixed: HTML Export now creates a new session for each asset it exports to diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 6529c6ee9..b44929118 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -1176,7 +1176,9 @@ sub prepareView { my $self = shift; $self->SUPER::prepareView(); my $template = WebGUI::Asset::Template->new($self->session, $self->get("collaborationTemplateId")) or die "no good: ".$self->get("collaborationTemplateId"); - $self->session->style->setLink($self->getRssUrl,{ rel=>'alternate', type=>'application/rss+xml', title=>$self->get('title') . ' RSS' }); + if ($self->get('rssCapableRssEnabled')) { + $self->session->style->setLink($self->getRssUrl,{ rel=>'alternate', type=>'application/rss+xml', title=>$self->get('title') . ' RSS' }); + } $template->prepare; $self->{_viewTemplate} = $template; }