fixed: Syndicated Content asset doesn't work with feeds that specify their encodings via HTTP headers

This commit is contained in:
Graham Knop 2009-01-28 18:03:37 +00:00
parent a8b096d675
commit e0e6e9b947
2 changed files with 5 additions and 1 deletions

View file

@ -1,4 +1,5 @@
7.6.11
- fixed: Syndicated Content asset doesn't work with feeds that specify their encodings via HTTP headers
7.6.10
- fixed #9577: WebGUI::Form::Url::getValue returns blank rather than undef for blank fields

View file

@ -146,7 +146,10 @@ sub generateFeed {
$value = $cache->setByHTTP($url, $self->get("cacheTimeout"));
$newlyCached = 1;
}
utf8::downgrade($value);
# if the content can be downgraded, it is either valid latin1 or didn't have
# an HTTP Content-Encoding header. In the second case, XML::FeedPP will take
# care of any encoding specified in the XML prolog
utf8::downgrade($value, 1);
eval {
my $singleFeed = XML::FeedPP->new($value, utf8_flag => 1);
$feed->merge($singleFeed);