From: Go MAEDA <maeda@farend.jp>
Date: Wed, 30 Aug 2023 07:40:32 +0000 (+0000)
Subject: Merged r22285 from trunk to 5.0-stable (#38697).
X-Git-Tag: 5.0.6~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=001e48a1510fc227753e636a9f8dfbedf48a9130;p=redmine.git

Merged r22285 from trunk to 5.0-stable (#38697).


git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22286 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index 61218d93a..69768c842 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -281,7 +281,7 @@ module Redmine
 
         container = obj.is_a?(Journal) ? obj.journalized : obj
         attachments = container.attachments if container.respond_to?(:attachments)
-        if (controller_name == 'previews' || action_name == 'preview') && @attachments.present?
+        if (controller_path == 'previews' || action_name == 'preview') && @attachments.present?
           attachments = (attachments.to_a + @attachments).compact
         end
         if attachments.present? && (attachment = Attachment.latest_attach(attachments, filename))
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 8f21e9a0b..007be1a14 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -199,6 +199,18 @@ class MailerTest < ActiveSupport::TestCase
     end
   end
 
+  def test_thumbnail_macro_in_email
+    set_tmp_attachments_directory
+    issue = Issue.generate!(:description => '{{thumbnail(image.png)}}')
+    issue.attachments << Attachment.new(:file => mock_file_with_options(:original_filename => 'image.png'), :author => User.find(1))
+    issue.save!
+
+    assert Mailer.deliver_issue_add(issue)
+    assert_select_email do
+      assert_select 'img[alt="image.png"]'
+    end
+  end
+
   def test_email_headers
     with_settings :mail_from => 'Redmine <redmine@example.net>' do
       issue = Issue.find(1)