diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 12c72b300..e347b58c7 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,7 @@ 7.10.1 - fixed #11851: Story Topic: top story variables should be available all the time - fixed #11854: CS doesn't return Not Found page + - fixed #11746: Thingy import CSV only supports one line ending 7.10.0 - fixed #11812: Checking www_ajaxSave's response in the cart js, urlencoding post parameters diff --git a/docs/gotcha.txt b/docs/gotcha.txt index d90fc7c7a..5ca8cb0a4 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -7,6 +7,10 @@ upgrading from one version to the next, or even between multiple versions. Be sure to heed the warnings contained herein as they will save you many hours of grief. +7.10.1 +-------------------------------------------------------------------- + * WebGUI now depends on PerlIO::eol, for doing line ending translation. + 7.10.0 -------------------------------------------------------------------- * Due to a bug in the 7.8.24-7.9.11 upgrade, the ordering of template diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index 916630390..b198b5c1b 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -20,6 +20,7 @@ use WebGUI::Form::File; use WebGUI::DateTime; use base 'WebGUI::Asset::Wobject'; use Data::Dumper; +use PerlIO::eol qw/NATIVE/; #------------------------------------------------------------------- @@ -2855,7 +2856,7 @@ sub www_import { next unless ($storage->getFileExtension($file) eq "csv"); $error->info("Found import file $file"); - open my $importFile,"<",$storage->getPath($file); + open my $importFile,"<:raw:eol(NATIVE)",$storage->getPath($file); my $lineNumber = 0; my @data = (); diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl index 87cfddb1f..3572dafc9 100755 --- a/sbin/testEnvironment.pl +++ b/sbin/testEnvironment.pl @@ -144,6 +144,7 @@ checkModule("Cache::FastMmap", "1.35" ); checkModule("CHI", "0.34" ); checkModule('IO::Socket::SSL', ); checkModule('Net::Twitter', "3.13006" ); +checkModule('PerlIO::eol', "0.14" ); failAndExit("Required modules are missing, running no more checks.") if $missingModule;