[otrs-cvs] otrs/Kernel/System Email.pm,1.72.2.2,1.72.2.3

Comments:
Update of /home/cvs/otrs/Kernel/System
In directory lancelot:/tmp/cvs-serv18629/Kernel/System

Modified Files:
      Tag: rel-3_0
	Email.pm 
Log Message:
Fixed bug#7879 - Ticket forward not working if content-id exists (workaround for Outlook 2010).

Author: cg

Index: Email.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/System/Email.pm,v
retrieving revision 1.72.2.2
retrieving revision 1.72.2.3
diff -2 -u -d -r1.72.2.2 -r1.72.2.3
--- Email.pm	21 Jun 2011 19:38:15 -0000	1.72.2.2
+++ Email.pm	4 May 2012 04:49:05 -0000	1.72.2.3
 <at>  <at>  -1,5 +1,5  <at>  <at> 
 # --
 # Kernel/System/Email.pm - the global email send module
-# Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
+# Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
 # --
 # $Id$
 <at>  <at>  -387,14 +387,14  <at>  <at> 
                             && $Upload->{Content} eq $Param{HTMLBody};

-                    # skip, but remember all attachments except inline images
-                    if ( !defined $Upload->{ContentID} ) {
-                        push  <at> NewAttachments, \%{$Upload};
-                        next ATTACHMENT;
-                    }
+                    # remember all attachments, force 'related' for content type on inline images
+                    push  <at> NewAttachments, \%{$Upload};

-                    # add inline images as related
-                    if ( $PartType ne 'related' ) {
-                        $Entity->make_multipart( 'related;', Force => 1, );
-                        $PartType = 'related';
+                    if ( defined $Upload->{ContentID} ) {
+
+                        # add inline images as related
+                        if ( $PartType ne 'related' ) {
+                            $Entity->make_multipart( 'related;', Force => 1, );
+                            $PartType = 'related';
+                        }
                     }
                 }
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log