oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed: Syndicated Content doesn't decode alternate character sets

Browse source
This commit is contained in:
Graham Knop 2008-09-05 22:13:59 +00:00
parent ceb082ea1a
commit 3d5224c93c
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
View file

@ -345,7 +345,12 @@ sub _get_rss_data {
$cache->set({'error' => 1, 'error_status' => $response->status_line}, 3600);
return undef;
}
my $xml = $response->decoded_content;
my $xmlEncoding;
if ($response->content =~ /<\?xml.*?encoding=['"](\S+)['"]/i) {
$xmlEncoding = $1;
}
my $xml = $response->decoded_content($xmlEncoding ? (charset => $xmlEncoding) : ());
# Approximate with current time if we don't have a Last-Modified
# header coming from the RSS source.
@ -353,16 +358,7 @@ sub _get_rss_data {
my $last_modified = defined($http_lm)? $http_lm : time;
# XML::RSSLite does not handle <![CDATA[ ]]> so:
$xml =~ s/<!\[CDATA\[(.*?)\]\]>/$1/sg;
# Convert encoding if needed
$xml =~ /<\?xml.*?encoding=['"](\S+)['"]/i;
my $xmlEncoding = $1 || 'utf8';
if (Encode::is_utf8($xml)) {
} else {
$xml = Encode::decode($xmlEncoding, $xml);
}
$xml =~ s/<!\[CDATA\[(.*?)\]\]>/HTML::Entities::encode_entities($1)/esg;
my $rss_lite = {};
eval {