openpkg-packages/rt/rt.patch

--- lib/RT/User_Overlay.pm.dist	Wed Apr  2 14:44:58 2003
+++ lib/RT/User_Overlay.pm	Wed Apr  2 14:45:17 2003
@@ -541,7 +541,7 @@
     # coming from a subdomain as coming from second level domain
     # foo.com
     if ($RT::CanonicalizeEmailAddressMatch && $RT::CanonicalizeEmailAddressReplace ) {
-        $email =~ s/\$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
+        $email =~ s/$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
     }
     return ($email);
 }
--- html/Ticket/Elements/ShowMessageStanza.dist	Wed Apr  2 15:28:24 2003
+++ html/Ticket/Elements/ShowMessageStanza	Wed Apr  2 17:23:30 2003
@@ -22,21 +22,22 @@
 %# 
 %# END LICENSE BLOCK
 <%perl>
-foreach my $stanza (@$Message) {
-    if ( ref $stanza eq "ARRAY" ) {
-        $m->comp( 'ShowMessageStanza',
-                  Depth   => $Depth + 1,
-                  Message => $stanza );
+  { my $msg = '';
+    foreach my $stanza (@$Message) {
+        if ( ref $stanza eq "ARRAY" ) {
+            $m->comp( 'ShowMessageStanza',
+                      Depth   => $Depth + 1,
+                      Message => $stanza );
+        }
+        elsif ( ref $stanza eq "HASH" ) {
+            my $content = $stanza->{raw};
+            RT::Interface::Web::EscapeUTF8(\$content);
+            $m->comp('/Elements/Callback', content => \$content, %ARGS);
+            $msg .= "$content\n";
+           }
     }
-    elsif ( ref $stanza eq "HASH" ) {
-        my $content = $stanza->{raw};
-        RT::Interface::Web::EscapeUTF8(\$content);
-        $m->comp('/Elements/Callback', content => \$content, %ARGS);
-                $content =~ s/\n/<br>/gi;
-
 </%perl>
-<font color="<%$colors[$Depth]%>"><%$content |n%><br></font>
-%       }
+<font color="<%$colors[$Depth]%>"><pre><%$msg |n%></pre><br></font>
 % }
 <%INIT>
 use URI::URL;