[Rt-commit] rt branch, 4.2/inline-images-before-makeclicky, created. rt-4.1.17-2-gb9041e5

[Thomas Sibley]

The branch, 4.2/inline-images-before-makeclicky has been created
        at  b9041e5bc9b69ab6f9a472a3b27f78c2e207b7a4 (commit)

- Log -----------------------------------------------------------------
commit b9041e5bc9b69ab6f9a472a3b27f78c2e207b7a4
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Jul 12 11:48:18 2013 -0700

    Inline images before running MakeClicky on the content
    
    This way MakeClicky can only break inline images after the fact, a less
    likely scenario than breaking them before.  It also provides MakeClicky
    with the full HTML to be rendered, which may be useful if a clicky
    handler is wrapping images.

diff --git a/share/html/Elements/ShowTransactionAttachments b/share/html/Elements/ShowTransactionAttachments
index 88e74b1..a0bab11 100644
--- a/share/html/Elements/ShowTransactionAttachments
+++ b/share/html/Elements/ShowTransactionAttachments
@@ -192,13 +192,6 @@ my $render_attachment = sub {
             if ( $content_type eq 'text/html' ) {
                 $content = $m->comp( '/Elements/ScrubHTML', Content => $content );
 
-                $m->comp(
-                    '/Elements/MakeClicky',
-                    content => \$content,
-                    html    => 1,
-                    object  => $Object,
-                );
-
                 if (RT->Config->Get('ShowTransactionImages')) {
                     my @rewritten = RT::Interface::Web::RewriteInlineImages(
                         Content         => \$content,
@@ -212,6 +205,13 @@ my $render_attachment = sub {
                     $displayed_inline->{$_}++ for @rewritten;
                 }
 
+                $m->comp(
+                    '/Elements/MakeClicky',
+                    content => \$content,
+                    html    => 1,
+                    object  => $Object,
+                );
+
                 unless (length $name) {
                     eval {
                         require HTML::Quoted;

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