Fixed a bug which would display the asset title twice when there was aggregate content

This commit is contained in:
Frank Dillon 2007-08-14 21:14:13 +00:00
parent fe45b8f347
commit b90c79f4c4

View file

@ -134,7 +134,7 @@ sub appendChoppedDescriptionTemplateVars {
$item->{"descriptionFirstSentence"} =~ s/^(.*?\.).*/$1/s;
}
#-------------------------------------------------------------------
#-------------------------------------------------------------------
=head2 definition ( definition )
@ -328,7 +328,7 @@ sub _normalize_items {
$item->{description} =~ s/'/\'/g;
$item->{category} = [$item->{category}]
if ref $item->{category} ne 'ARRAY';
appendChoppedDescriptionTemplateVars($item);
appendChoppedDescriptionTemplateVars($item);
}
}
@ -666,17 +666,13 @@ sub view {
return $self->processTemplate(\%var,undef,$self->{_viewTemplate});
}
if(@$rss_feeds > 1){
#If there is more than one (valid) feed in this wobject, put in the wobject description info.
$var{'channel.title'} = $title;
$var{'channel.description'} = $self->get('description');
} else {
if(@$rss_feeds == 1){
#One feed. Put in the info from the feed.
$var{'channel.title'} = $rss_feeds->[0]->{channel}->{title} || $title;
$var{'channel.link'} = $rss_feeds->[0]->{channel}->{link};
$var{'channel.description'} = $rss_feeds->[0]->{channel}->{description};
}
$self->_createRSSURLs(\%var);
$var{item_loop} = $item_loop;