X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=5d860f2de4fcd95b9d31332bea56314b88453d02;hb=130c7801e718d55c500e9f777112f51905cad060;hp=f1e5c7de5b184f0f6da47d410138bb46df5dcf3d;hpb=de3bf373e97f6875e09fc17d99068a2716bf3b2d;p=freeside.git

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