[Rt-commit] rt branch, master, updated. rt-4.1.5-10-g62a747a

[Alex Vandiver]

The branch, master has been updated
       via  62a747a0a49e0ef335224fe49c43d2f28968686c (commit)
      from  0e960a5c30d36ae79f99c231d8ab25e97a8a2833 (commit)

Summary of changes:
 lib/RT/Dashboard/Mailer.pm | 2 +-
 lib/RT/Interface/Web.pm    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 62a747a0a49e0ef335224fe49c43d2f28968686c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 6 18:52:03 2012 -0500

    Correct two cases of EscapeUTF8 → EscapeHTML missing from aab36cf

diff --git a/lib/RT/Dashboard/Mailer.pm b/lib/RT/Dashboard/Mailer.pm
index a264373..df8ba50 100644
--- a/lib/RT/Dashboard/Mailer.pm
+++ b/lib/RT/Dashboard/Mailer.pm
@@ -450,7 +450,7 @@ sub BuildEmail {
                 autohandler_name => '', # disable forced login and more
                 data_dir => $data_dir,
             );
-            $mason->set_escape( h => \&RT::Interface::Web::EscapeUTF8 );
+            $mason->set_escape( h => \&RT::Interface::Web::EscapeHTML );
             $mason->set_escape( u => \&RT::Interface::Web::EscapeURI  );
             $mason->set_escape( j => \&RT::Interface::Web::EscapeJS   );
         }
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 6fd247a..184c1c9 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1094,7 +1094,7 @@ sub StripContent {
     # Check for plaintext sig
     return '' if not $html and $content =~ /^(--)?\Q$sig\E$/;
 
-    # Check for html-formatted sig; we don't use EscapeUTF8 here
+    # Check for html-formatted sig; we don't use EscapeHTML here
     # because we want to precisely match the escapting that FCKEditor
     # uses.
     $sig =~ s/&/&/g;

-----------------------------------------------------------------------