X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=d1535b5a39dddf34839b9ba8374918a4f0f565f1;hb=7e67c654c102bb5d9a62229161f7e8464f36a71a;hp=297d591eaef2d833ca1392231ef6a7ef41ad7e45;hpb=917b645ae876153480207c9118acd6099531955f;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 297d591ea..d1535b5a3 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -508,8 +508,8 @@ if ( -e $addl_handler_use_file ) {
   };
   
   sub include {
-    use vars qw($m);
-    #carp #should just switch to <& &> syntax
+    use vars qw($m @CARP_NOT);
+    warn 'include deprecated; use an HTML::Mason <& &> style include (or $m->scomp) at '. $m->callers(1)->path. "\n";
     $m->scomp(@_);
   }
 
@@ -646,7 +646,8 @@ sub mason_interps {
                       [ 'rt'       => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
                       [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
                     ],
-    escape_flags => { 'h'         => \&RT::Interface::Web::EscapeUTF8,
+    escape_flags => { 'h'         => \&RT::Interface::Web::EscapeHTML,
+                      #u and j aren't used anymore?  :/
                       'u'         => \&RT::Interface::Web::EscapeURI,
                       'j'         => \&RT::Interface::Web::EscapeJS,
                       'js_string' => $js_string_sub,