[Rt-commit] r18186 - in rt/3.999/branches/lorzy: share/html/Elements share/html/Ticket/Elements

Wed Feb 4 08:11:05 EST 2009

Author: clkao
Date: Wed Feb  4 08:11:04 2009
New Revision: 18186

Modified:
   rt/3.999/branches/lorzy/   (props changed)
   rt/3.999/branches/lorzy/share/html/Elements/Header
   rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowMessageHeaders

Log:
merge branch merge_to_3.8.2 to lorzy.

Modified: rt/3.999/branches/lorzy/share/html/Elements/Header
==============================================================================

--- rt/3.999/branches/lorzy/share/html/Elements/Header	(original)
+++ rt/3.999/branches/lorzy/share/html/Elements/Header	Wed Feb  4 08:11:04 2009
@@ -51,8 +51,6 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
 <title><%$title%></title>
-
-
 % if ($refresh && $refresh =~ /^(\d+)/ && $1 > 0) {
     <meta http-equiv="refresh" content="<% $refresh %>" />
 % }
@@ -106,6 +104,7 @@
 % }
 
 <%INIT>
+$r->content_type('text/html; charset=utf-8');
 $r->headers_out->{'Pragma'} = 'no-cache';
 $r->headers_out->{'Cache-control'} = 'no-cache';
 

Modified: rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowMessageHeaders
==============================================================================
--- rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowMessageHeaders	(original)
+++ rt/3.999/branches/lorzy/share/html/Ticket/Elements/ShowMessageHeaders	Wed Feb  4 08:11:04 2009
@@ -49,8 +49,8 @@
 <table>
 % foreach my $header (@headers) {
   <tr>
-    <td align="right" class="message-header-key"><% $header->{'Tag'} %>:</td>
-    <td class="message-header-value"><% $header->{'Value'} | n %></td>
+    <td align="right" class="message-header-key"><% $header->{'tag'} %>:</td>
+    <td class="message-header-value"><% $header->{'value'} | n %></td>
   </tr>
 % }
 </table>
@@ -60,7 +60,7 @@
 foreach my $field( RT->config->get('ShowBccHeader')? $message->_split_headers : $message->split_headers ) {
     my ($tag, $value) = split /:/, $field, 2;
     next unless $tag && $value;
-    push @headers, { Tag => $tag, value => $value };
+    push @headers, { tag => $tag, value => $value };
 }
 
 my %display_headers = map { lc($_) => 1 } @display_headers;
@@ -72,16 +72,16 @@
 );
 
 unless ( $display_headers{'_all'} ) {
-    @headers = grep $display_headers{ lc $_->{'Tag'} }, @headers;
+    @headers = grep $display_headers{ lc $_->{'tag'} }, @headers;
 }
 
 my $ticket = $message->transaction_obj->ticket_obj;
 foreach my $f (@headers) {
-    $m->comp('/Elements/MakeClicky', content => \$f->{'Value'}, ticket => $ticket, %ARGS);
+    $m->comp('/Elements/MakeClicky', content => \$f->{'value'}, ticket => $ticket, %ARGS);
 }
 
 if ( $localize ) {
-    $_->{'Tag'} = _($_->{'Tag'}) foreach @headers;
+    $_->{'tag'} = _($_->{'tag'}) foreach @headers;
 }
 </%INIT>
 <%ARGS>
