From: ivan Date: Sun, 10 Oct 2010 23:41:32 +0000 (+0000) Subject: should fix wrapping of CDRs reported under IEq, RT#9964 X-Git-Tag: TORRUS_1_0_9~233 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=6b88e6c5617d52ab4a58677f6a92413ed4509714;hp=7430f21fafadacc4e28078f0273b5e3aeb131800 should fix wrapping of CDRs reported under IEq, RT#9964 --- diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index d364ac527..d9c2c40e2 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -2291,7 +2291,7 @@ sub print_generic { my $nbsp = $nbsps{$format}; my %escape_functions = ( 'latex' => \&_latex_escape, - 'html' => \&encode_entities, + 'html' => \&_html_escape, #\&encode_entities, 'template' => sub { shift }, ); my $escape_function = $escape_functions{$format}; @@ -3165,6 +3165,14 @@ sub _latex_escape { $value; } + +sub _html_escape { + my $value = shift; + encode_entities($value); + $value =~ s/ +/ /g; + $value; +} + #utility methods for print_* sub _translate_old_latex_format {