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 26eca2ff06
commit d3e3c90a42
3 changed files with 2 additions and 5 deletions

View file

@ -10,6 +10,7 @@
- fixed #11798: Gallery request non existent image
- fixed #11800: Group to view for new events defaults to 'Everyone'
- fixed #11796: Gallery Drag & Drop broken in IE 7
- fixed #11795: Wrong display UTF8 chars in Syndicated content (#12621)
7.9.12
- webgui.org homepage gives 404 (#11778)

View file

@ -162,10 +162,6 @@ sub generateFeed {
}
}, $self->cacheTimeout );
# 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);

View file

@ -19,7 +19,6 @@ use lib "$FindBin::Bin/../../../lib";
use WebGUI::Test;
use Test::More; # increment this value for each test you create
use WebGUI::Session;
plan skip_all => 'set TEST_ENCODINGS to enable this test' unless $ENV{TEST_ENCODINGS};
plan tests => 13; # increment this value for each test you create
use Test::Deep;
use WebGUI::Asset::Wobject::SyndicatedContent;
@ -103,6 +102,7 @@ is $syndicated_content->generateFeed->title, $es_title, 'No encoding in prolog,
$cache->set($iso_8859_1, 60);
is $syndicated_content->generateFeed->title, $es_title, 'ISO-8859-1 encoded';
$cache->set($iso_8859_5, 60);
is $syndicated_content->generateFeed->title, $ru_title, 'ISO-8859-5 encoded';