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

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 5c7a16745..20748dc1d 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -244,6 +244,9 @@ if ( -e $addl_handler_use_file ) {
   use FS::cgp_rule_action;
   use FS::bill_batch;
   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 ) {
@@ -256,6 +259,7 @@ if ( -e $addl_handler_use_file ) {
       use lib ( "/opt/rt3/local/lib", "/opt/rt3/lib" );
       use vars qw($Nobody $SystemUser);
       use RT;
+      use RT::Util;
       use RT::Tickets;
       use RT::Transactions;
       use RT::Users;
@@ -480,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]}. "'";
                       },