[Rt-commit] rt branch, master, updated. rt-4.1.19-64-g2a75138

[Alex Vandiver]

The branch, master has been updated
       via  2a751389746715f0c3b657d368c663ee260a1c05 (commit)
       via  b9041e5bc9b69ab6f9a472a3b27f78c2e207b7a4 (commit)
      from  8b422f544541cf3a003c3c2e3c01a7c964738c7f (commit)

Summary of changes:
 share/html/Elements/ShowTransactionAttachments | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 2a751389746715f0c3b657d368c663ee260a1c05
Merge: 8b422f5 b9041e5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Aug 26 16:47:56 2013 -0400

    Merge branch '4.2/inline-images-before-makeclicky'
    
    Conflicts:
    	share/html/Elements/ShowTransactionAttachments

diff --cc share/html/Elements/ShowTransactionAttachments
index 4cad511,a0bab11..cc3f9c7
--- a/share/html/Elements/ShowTransactionAttachments
+++ b/share/html/Elements/ShowTransactionAttachments
@@@ -212,7 -205,14 +205,14 @@@ my $render_attachment = sub 
                      $displayed_inline->{$_}++ for @rewritten;
                  }
  
+                 $m->comp(
+                     '/Elements/MakeClicky',
+                     content => \$content,
+                     html    => 1,
+                     object  => $Object,
+                 );
+ 
 -                unless (length $name) {
 +                if ( !length $name && RT->Config->Get( 'QuoteFolding', $session{CurrentUser} ) ) {
                      eval {
                          require HTML::Quoted;
                          $content = HTML::Quoted->extract($content)

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