[Rt-commit] r12275 - in rtfm/branches/2.2-RELEASE/html: RTFM/Article/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon May 12 17:45:00 2008
New Revision: 12275

Modified:
   rtfm/branches/2.2-RELEASE/html/Callbacks/RTFM/Elements/MessageBox/Default
   rtfm/branches/2.2-RELEASE/html/RTFM/Article/Elements/Preformatted

Log:
* backport changes from 2.3 branch that should be here

Modified: rtfm/branches/2.2-RELEASE/html/Callbacks/RTFM/Elements/MessageBox/Default
==============================================================================
--- rtfm/branches/2.2-RELEASE/html/Callbacks/RTFM/Elements/MessageBox/Default	(original)
+++ rtfm/branches/2.2-RELEASE/html/Callbacks/RTFM/Elements/MessageBox/Default	Mon May 12 17:45:00 2008
@@ -32,13 +32,14 @@
     next unless $article && $article->id;
 
     my $Ticket = $ARGS{Ticket};
-    if ( !$Ticket and $ARGS{id} and $ARGS{id} ne 'new' ) {
+    if ( !($Ticket and $Ticket->id) and $ARGS{id} and $ARGS{id} ne 'new' ) {
         $Ticket = RT::Ticket->new($session{'CurrentUser'});
-        my ($id,$msg) = $Ticket->Load($ARGS{id});
-        unless ($id) {
-            $RT::Logger->error("Couldn't load ticket $ARGS{id}: $msg")
+        $Ticket->Load($ARGS{id});
+        unless ($Ticket->id) {
+            $RT::Logger->error("Couldn't load ticket #". $ARGS{id});
         }
     }
+    $Ticket = undef unless $Ticket->id;
 
 
     $m->comp('/RTFM/Article/Elements/Preformatted',

Modified: rtfm/branches/2.2-RELEASE/html/RTFM/Article/Elements/Preformatted
==============================================================================
--- rtfm/branches/2.2-RELEASE/html/RTFM/Article/Elements/Preformatted	(original)
+++ rtfm/branches/2.2-RELEASE/html/RTFM/Article/Elements/Preformatted	Mon May 12 17:45:00 2008
@@ -79,8 +79,11 @@
     my $content = $value->Content;
     return '' unless defined $content && length $content;
 
-    $$m->comp('/Elements/Callback', _CallbackName => 'UpdateLogic', 
-              content => \$content, %ARGS );
+    $m->comp('/Elements/Callback',
+        %ARGS,
+        _CallbackName => 'ProcessContent', 
+        content => \$content,
+    );
 
     if ( $content =~ /<.{1,5}>/ ) {
         $content = $de_htmlify->( $content );