[Rt-commit] rt branch, 4.2/serializer-importer, updated. rt-4.1.19-259-gf258067

[Kevin Falcone]

The branch, 4.2/serializer-importer has been updated
       via  f2580670585f077ae116681b2ab2c9c66ee95fa4 (commit)
      from  3936ee25c8395e974bb9468bbb9dcca9a27e23c8 (commit)

Summary of changes:
 lib/RT/Migrate/Incremental.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit f2580670585f077ae116681b2ab2c9c66ee95fa4
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Sep 5 13:07:58 2013 -0400

    Merge in my change to a regex from 474aaf6c11
    
    This better handles the two different Forward template formats.

diff --git a/lib/RT/Migrate/Incremental.pm b/lib/RT/Migrate/Incremental.pm
index 15caa4c..db645c7 100644
--- a/lib/RT/Migrate/Incremental.pm
+++ b/lib/RT/Migrate/Incremental.pm
@@ -571,9 +571,9 @@ s!(?<=Your ticket has been (?:approved|rejected) by { eval { )\$Approval->OwnerO
             my ($ref) = @_;
             if ($ref->{Name} eq 'Forward') {
                 $ref->{Description} = 'Forwarded message';
-                if ( $ref->{Content} eq q{
-This is a forward of transaction #{$Transaction->id} of ticket #{ $Ticket->id }
-} ) {
+                if ( $ref->{Content} =~
+                     m/^\n*This is (a )?forward of transaction #\{\s*\$Transaction->id\s*\} of (a )?ticket #\{\s*\$Ticket->id\s*\}\n*$/
+                   ) {
                     $ref->{Content} = q{
 { $ForwardTransaction->Content =~ /\S/ ? $ForwardTransaction->Content : "This is a forward of transaction #".$Transaction->id." of ticket #". $Ticket->id }
 };

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