notices, RT#8324

[freeside.git] / FS / FS / Mason.pm

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index f1e5c7d..20748dc 100644 (file)
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -246,6 +246,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_bill_batch;
   use FS::rate_time;
   use FS::rate_time_interval;
+  use FS::msg_template;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -483,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]}. "'";
                       },