import rt 3.4.4

[freeside.git] / rt / html / Ticket / Display.html

diff --git a/rt/html/Ticket/Display.html b/rt/html/Ticket/Display.html
index 745ed42..dd4c093 100644 (file)
--- a/rt/html/Ticket/Display.html
+++ b/rt/html/Ticket/Display.html
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <& /Elements/Header, 
     Title => loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject) &>
 <& /Ticket/Elements/Tabs, 
@@ -58,6 +58,9 @@
 <& /Elements/TitleBoxEnd &>
 
 <BR>
+
+<& /Elements/Callback, _CallbackName => 'BeforeShowHistory', Ticket => $TicketObj, %ARGS &>
+
 <& /Ticket/Elements/ShowHistory , 
       Ticket => $TicketObj, 
       Tickets => $Tickets, 
@@ -124,10 +127,11 @@ if ($ARGS{'id'} eq 'new') {
        }
     }
 
-    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g;
+    $ARGS{'UpdateContent'} =~ s/\r\n/\n/g if defined $ARGS{'UpdateContent'};
     if ( $ARGS{'UpdateTimeWorked'} ||
         $session{'Attachments'} || 
-        (   $ARGS{'UpdateContent'} ne ''
+        (   defined $ARGS{'UpdateContent'}
+             && $ARGS{'UpdateContent'} ne ''
             && $ARGS{'UpdateContent'} ne "-- \n"
             . $session{'CurrentUser'}->UserObj->Signature )) {
        $ARGS{UpdateAttachments} = $session{'Attachments'};