From 93990cc8dc3be5bd0ec94c211859a7d5c6d336a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Thu, 19 May 2011 06:54:38 +0200 Subject: [PATCH] Bug 6371 Item Types description not properly displayed if not pure ASCII In several places, C4::ItemType module is used to retrieve item types and their description. If the description text contains non-ASCII characters, those characters are not properly displayed. This bug can be seen in: - 4xx plugin of a UNIMARC DB - Home > Admin > Item circulation alerts - others?... Signed-off-by: Katrin Fischer - Fixes display probems in circulation alerts and 4xx UNIMARC plugin - display in other places looks ok with and without patch Signed-off-by: Paul Poulain --- C4/ItemType.pm | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/C4/ItemType.pm b/C4/ItemType.pm index e66d917..70d2690 100644 --- a/C4/ItemType.pm +++ b/C4/ItemType.pm @@ -73,12 +73,15 @@ C. sub all { my ($class) = @_; my $dbh = C4::Context->dbh; - return map { $class->new($_) } @{$dbh->selectall_arrayref( - # The itemtypes table is small enough for - # `SELECT *` to be harmless. - "SELECT * FROM itemtypes ORDER BY description", - { Slice => {} }, - )}; + + my @itypes; + for ( @{$dbh->selectall_arrayref( + "SELECT * FROM itemtypes ORDER BY description", { Slice => {} })} ) + { + utf8::encode($_->{description}); + push @itypes, $class->new($_); + } + return @itypes; } -- 1.7.4.1