diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-08-30 07:40:32 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-08-30 07:40:32 +0000 |
| commit | 001e48a1510fc227753e636a9f8dfbedf48a9130 (patch) | |
| tree | 815cd2323025e1e76f213a14f3e868423b7f7b77 /lib | |
| parent | 37c32469214dc364bfd6cc66c60c43b30b252834 (diff) | |
| download | redmine-001e48a1510fc227753e636a9f8dfbedf48a9130.tar.gz redmine-001e48a1510fc227753e636a9f8dfbedf48a9130.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting/macros.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |