Fix encoding problems with the SC asset. Update the encodings test to no longer require an ENV variable to run. Fixes bug #11795

This commit is contained in:
Colin Kuskie 2010-08-24 16:53:35 -07:00
parent 3238eb9432
commit c79bc75840
3 changed files with 3 additions and 6 deletions

View file

@ -168,11 +168,7 @@ sub generateFeed {
$value = $cache->setByHTTP($url, $self->get("cacheTimeout"));
$newlyCached = 1;
}
#warn "got this: $value\n";
# 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, -type => 'string', xml_deref => 1, @opt);
$feed->merge_channel($singleFeed);