[otrs-cvs] CVS: otrs/Kernel/Modules AgentTicketCompose.pm, 1.22, 1.22.2.1

[cvs-log at otrs.org]

Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv9233/Kernel/Modules

Modified Files:
      Tag: rel-2_1
	AgentTicketCompose.pm 
Log Message:
fixed order of notify lines

Index: AgentTicketCompose.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketCompose.pm,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** AgentTicketCompose.pm	30 Nov 2006 12:32:47 -0000	1.22
--- AgentTicketCompose.pm	8 Jan 2007 20:51:17 -0000	1.22.2.1
***************
*** 1,5 ****
  # --
  # Kernel/Modules/AgentTicketCompose.pm - to compose and send a message
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # Kernel/Modules/AgentTicketCompose.pm - to compose and send a message
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
***************
*** 571,584 ****
          if ($Customer{UserEmail} && $Data{ToEmail} !~ /^\Q$Customer{UserEmail}\E$/i) {
              if ($Self->{ConfigObject}->Get('Ticket::Frontend::ComposeReplaceSenderAddress')) {
!                 $Output .= $Self->{LayoutObject}->Notify(
!                     Priority => 'Info',
!                     Data => '$Text{"To: (%s) replaced with database email!", "'.$Data{To}.'"}',
                  );
                  $Data{To} = $Customer{UserEmail};
              }
              else {
!                 $Output .= $Self->{LayoutObject}->Notify(
!                     Priority => 'Info',
!                     Data => '$Text{"Cc: (%s) added database email!", "'.$Customer{UserEmail}.'"}',
                  );
                  if ($Data{Cc}) {
--- 571,588 ----
          if ($Customer{UserEmail} && $Data{ToEmail} !~ /^\Q$Customer{UserEmail}\E$/i) {
              if ($Self->{ConfigObject}->Get('Ticket::Frontend::ComposeReplaceSenderAddress')) {
!                 $Self->{LayoutObject}->Block(
!                     Name => 'PropertiesRecipientTo',
!                     Data => {
!                         To => $Data{To},
!                     },
                  );
                  $Data{To} = $Customer{UserEmail};
              }
              else {
!                 $Self->{LayoutObject}->Block(
!                     Name => 'PropertiesRecipientCc',
!                     Data => {
!                         Cc => $Customer{UserEmail},
!                     },
                  );
                  if ($Data{Cc}) {