X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=20748dc1d77972d7dba7f6a2e53901de426d498c;hb=f9a89c91cab9e85a7ca8dd67782919f8a85c2ebb;hp=aec6342b09889a2c1d3a42a9479be54636dce951;hpb=cf69551b63fb966966938ca2b9c6201a5f40a1f9;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index aec6342b0..20748dc1d 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -484,6 +484,7 @@ sub mason_interps {
     escape_flags => { 'js_string' => sub {
                         #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
                         ${$_[0]} =~ s/(['\\])/\\$1/g;
+                        ${$_[0]} =~ s/\r/\\r/g;
                         ${$_[0]} =~ s/\n/\\n/g;
                         ${$_[0]} = "'". ${$_[0]}. "'";
                       },