From a225a9320aa5b1731c4b4679dfde4f2550492de4 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Tue, 17 Jun 2014 16:38:54 +0200 Subject: [PATCH] Bug 12438 - Bad encoding in acquisition basket We noticed a bad encoding (diacritics replaced by ) in acquisition basket when updating a server to Debian Wheezy. We found it comes from a query containing biblio.title twice. Maybe the mysql newer version creates this side-effect. Test plan : - Create an order on a record containing a diacritic in title - Look at the basket : cgi-bin/koha/acqui/basket.pl?basketno=x => Without the patch the record title is bad encoded (with ) => With this patch the record title is well encoded - Check also basket CSV export Signed-off-by: Paola Rossi Signed-off-by: Katrin Fischer Good catch! Works as expected, passes tests and QA script. Signed-off-by: Tomas Cohen Arazi Duplicated biblio.title is a (minor) bug, and should be removed. The side-effect of it solving an encoding problem might be seen as problematic: it hides a real problem. The efforts on 11944 actually solve this encoding problem (11944 merged into master actually fixes this), so I'm pushing it, for a short term solution for stable, with the hope that we will soon have 11944 pushed. BTW, non-diacritic but non-ASCII characters are not broken either. (cherry picked from commit 9fe36e0c705b958859babe565517554b722c66cd) Signed-off-by: Fridolin Somers Signed-off-by: Kyle M Hall (cherry picked from commit aa94a7c0e45d9aab79ec9958b59e142dcda616cf) --- C4/Acquisition.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index f41a15dd93..5c49d4a6ec 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -937,8 +937,7 @@ sub GetOrders { my $query =" SELECT biblio.*,biblioitems.*, aqorders.*, - aqbudgets.*, - biblio.title + aqbudgets.* FROM aqorders LEFT JOIN aqbudgets ON aqbudgets.budget_id = aqorders.budget_id LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber -- 2.20.1