From 333593c011cfe83501516ecf719808b8408b846e Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 3 Dec 2015 11:23:54 -0300 Subject: [PATCH] Bug 15290: SQL reports headers encoding problem MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To test: - Create an SQL report with column names containing UTF characters - Run the report => FAIL: The column names are double encoded - Export the report => FAIL: The column names are double encoded in the exported file - Apply the patch - Re-run the report (reload works) => SUCCESS: Encoding correct - Export the report => SUCCESS: Encoding correct - Sign off :-D Signed-off-by: Frédéric Demians Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 879b1386ff3a274d0884dc0b48afa6064c35eed7) Signed-off-by: Julian Maurice --- reports/guided_reports.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index cbdecda8cd..361c518742 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -771,7 +771,7 @@ elsif ($phase eq 'Run this report'){ unless ($sth) { die "execute_query failed to return sth for report $report_id: $sql"; } else { - my $headers= header_cell_loop($sth); + my $headers = header_cell_loop($sth); $template->param(header_row => $headers); while (my $row = $sth->fetchrow_arrayref()) { my @cells = map { +{ cell => $_ } } @$row; @@ -948,7 +948,7 @@ sub header_cell_values { # pass $sth, get back a TMPL_LOOP-able set of names for the column headers sub header_cell_loop { - my @headers = map { +{ cell => $_ } } header_cell_values (shift); + my @headers = map { +{ cell => decode('UTF-8',$_) } } header_cell_values (shift); return \@headers; } -- 2.39.5