fixed: Syndicated Content corrupts wide characters

This commit is contained in:
Graham Knop 2009-01-09 10:33:12 +00:00
parent 08d961fee2
commit 33a3f2b439
2 changed files with 7 additions and 2 deletions

View file

@ -32,6 +32,7 @@
- fixed #9400: Form.captcha should be form_capcha in dataform help
- fixed #9402: i18n confusion
- fixed #9403: i18n survey
- fixed: Syndicated Content corrupts wide characters
7.6.7
- fixed #9263: Thingy possibleValues processing, and List type autodetection.

View file

@ -143,10 +143,14 @@ sub generateFeed {
my $cache = WebGUI::Cache->new($self->session, $url, "RSS");
my $value = $cache->get;
unless ($value) {
$value = $cache->setByHTTP($url, $self->get("cacheTimeout"));
$value = $cache->setByHTTP($url, $self->get("cacheTimeout"));
$newlyCached = 1;
}
eval { $feed->merge($value) };
utf8::downgrade($value);
eval {
my $singleFeed = XML::FeedPP->new($value, utf8_flag => 1);
$feed->merge($singleFeed);
};
if (my $e = WebGUI::Error->caught()) {
$log->error("Syndicated Content asset (".$self->getId.") has a bad feed URL (".$url."). Failed with ".$e->message);
}