[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-945-g993d508

[? sunnavy]

The branch, 3.9-trunk has been updated
       via  993d50876f5bd04794426b195a415874759f1cee (commit)
      from  b6f6355c9f848ddadb114caa21313888d3281ee1 (commit)

Summary of changes:
 .../Ticket/Elements/ShowTransactionAttachments     |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 993d50876f5bd04794426b195a415874759f1cee
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Dec 20 13:40:01 2010 +0800

    tweak the reason order of "message body is not shown"

diff --git a/share/html/Ticket/Elements/ShowTransactionAttachments b/share/html/Ticket/Elements/ShowTransactionAttachments
index 1053c78..6fb3527 100644
--- a/share/html/Ticket/Elements/ShowTransactionAttachments
+++ b/share/html/Ticket/Elements/ShowTransactionAttachments
@@ -153,16 +153,16 @@ my $render_attachment = sub {
     # If it's text
     if ( $message->ContentType =~ m{^(text|message)}i ) {
         my $max_size = RT->Config->Get( 'MaxInlineBody', $session{'CurrentUser'} );
-        if ( $message->Filename && RT->Config->Get('SuppressInlineTextFiles', $session{'CurrentUser'} ) ) {
-            $m->out('<p>'. loc( 'Text file is not shown because it is disabled in preferences.' ) .'</p>');
+        if ( $disposition ne 'inline' ) {
+            $m->out('<p>'. loc( 'Message body is not shown because sender requested not to inline it.' ) .'</p>');
             return;
         }
-        elsif ( $max_size && $message->ContentLength > $max_size ) {
-            $m->out('<p>'. loc( 'Message body not shown because it is too large.' ) .'</p>');
+        elsif ( $message->Filename && RT->Config->Get('SuppressInlineTextFiles', $session{'CurrentUser'} ) ) {
+            $m->out('<p>'. loc( 'Text file is not shown because it is disabled in preferences.' ) .'</p>');
             return;
         }
-        elsif ( $disposition ne 'inline' ) {
-            $m->out('<p>'. loc( 'Message body is not shown because sender requested not to inline it.' ) .'</p>');
+        elsif ( $max_size && $message->ContentLength > $max_size ) {
+            $m->out('<p>'. loc( 'Message body is not shown because it is too large.' ) .'</p>');
             return;
         }
 

-----------------------------------------------------------------------