[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.6-61-g4eb846f

jesse jesse at bestpractical.com
Fri Oct 30 14:59:36 EDT 2009


The branch, 3.8-trunk has been updated
       via  4eb846f4b7da66940f6bc479a0367d226969e99d (commit)
      from  c325f902cb9ff174b15b73d5809bce55b42fc764 (commit)

Summary of changes:
 share/html/Ticket/Elements/ShowMessageStanza |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 4eb846f4b7da66940f6bc479a0367d226969e99d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Oct 30 14:54:21 2009 -0400

    RT was accidentally injecting too many newlines when rendering plaintext messages without <pre>.
    
    This commit fixes the regex.

diff --git a/share/html/Ticket/Elements/ShowMessageStanza b/share/html/Ticket/Elements/ShowMessageStanza
index e9b57bb..0d4fe61 100755
--- a/share/html/Ticket/Elements/ShowMessageStanza
+++ b/share/html/Ticket/Elements/ShowMessageStanza
@@ -98,7 +98,7 @@ my $print_content = sub {
     $m->callback( content => $ref, %ARGS );
     $m->comp('/Elements/MakeClicky', content => $ref, ticket => $ticket, %ARGS);
     unless ( $plain_text_pre || $plain_text_mono ) {
-        $$ref =~ s{(?=\r*\n)}{<br />}g if defined $$ref;
+        $$ref =~ s{(\r?\n)}{<br />}g if defined $$ref;
     }
     $m->out( $$ref );
 };

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


More information about the Rt-commit mailing list