use UTF8 JSON encoding and decoding universally
fixed: Import/Export of packages with international text is broken
This commit is contained in:
parent
35bfeac0ef
commit
9ed284beec
16 changed files with 42 additions and 40 deletions
|
|
@ -25,7 +25,7 @@ use WebGUI::DateTime;
|
|||
use DateTime::TimeZone;
|
||||
|
||||
use LWP::UserAgent;
|
||||
use JSON qw(to_json from_json);
|
||||
use JSON qw(encode_json decode_json);
|
||||
|
||||
=head1 NAME
|
||||
|
||||
|
|
@ -92,8 +92,8 @@ sub execute {
|
|||
my $eventList = [];
|
||||
my $feedList;
|
||||
if ($instance->getScratch('events')) {
|
||||
$eventList = from_json($instance->getScratch('events'));
|
||||
$feedList = from_json($instance->getScratch('feeds'));
|
||||
$eventList = decode_json($instance->getScratch('events'));
|
||||
$feedList = decode_json($instance->getScratch('feeds'));
|
||||
}
|
||||
else {
|
||||
my $ua = LWP::UserAgent->new(agent => "WebGUI");
|
||||
|
|
@ -356,8 +356,8 @@ sub execute {
|
|||
}
|
||||
while (@$eventList) {
|
||||
if ($startTime + 55 < time()) {
|
||||
$instance->setScratch('events', to_json($eventList));
|
||||
$instance->setScratch('feeds', to_json($feedList));
|
||||
$instance->setScratch('events', encode_json($eventList));
|
||||
$instance->setScratch('feeds', encode_json($feedList));
|
||||
return $self->WAITING;
|
||||
}
|
||||
my $eventData = shift @$eventList;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue