diff options
| author | ivan <ivan> | 2008-03-03 23:07:58 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-03-03 23:07:58 +0000 |
| commit | 479339313bbda612f8fe939217fd067999ef36d4 (patch) | |
| tree | a47e2fbdc0107910bbbd3b57dc0cbfc357f76aa3 /rt/html/Ticket/Display.html | |
| parent | 642d85fc54b066e6364b66644b95c7b123ba8e24 (diff) | |
merge in rt 3.4.6. *gulp*!
Diffstat (limited to 'rt/html/Ticket/Display.html')
| -rw-r--r-- | rt/html/Ticket/Display.html | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html index dd4c093dc..908a7a93a 100644 --- a/rt/html/Ticket/Display.html +++ b/rt/html/Ticket/Display.html @@ -128,17 +128,19 @@ if ($ARGS{'id'} eq 'new') { } $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'}; - if ( $ARGS{'UpdateTimeWorked'} || - $session{'Attachments'} || - ( defined $ARGS{'UpdateContent'} - && $ARGS{'UpdateContent'} ne '' - && $ARGS{'UpdateContent'} ne "-- \n" - . $session{'CurrentUser'}->UserObj->Signature )) { - $ARGS{UpdateAttachments} = $session{'Attachments'}; - ProcessUpdateMessage( ARGSRef => \%ARGS, - Actions => \@Actions, - TicketObj => $TicketObj ); - delete $session{'Attachments'}; + if ( $ARGS{'UpdateTimeWorked'} || ( + defined $ARGS{'UpdateContent'} + && $ARGS{'UpdateContent'} ne '' + && $ARGS{'UpdateContent'} ne "-- \n" + . $session{'CurrentUser'}->UserObj->Signature ) ) + { + $ARGS{UpdateAttachments} = $session{'Attachments'}; + ProcessUpdateMessage( + ARGSRef => \%ARGS, + Actions => \@Actions, + TicketObj => $TicketObj, + ); + delete $session{'Attachments'}; } #Process status updates my @BasicActions = ProcessTicketBasics(ARGSRef => \%ARGS, TicketObj=>$TicketObj); |