summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-12-16 07:59:35 +0000
committerGo MAEDA <maeda@farend.jp>2022-12-16 07:59:35 +0000
commitf094471ff51bf6c9984fd30e54b27925b0616d2d (patch)
tree6bcb9d46322bda36dba799e48a2c97196ef9a200
parent969872fb03a832d29c7030cc7edefd6f3a38f6cf (diff)
downloadredmine-f094471ff51bf6c9984fd30e54b27925b0616d2d.tar.gz
redmine-f094471ff51bf6c9984fd30e54b27925b0616d2d.zip
Fix shadowing variable in ApplicationHelper#textilizable (#15667).
Patch by Ilya S. git-svn-id: https://svn.redmine.org/redmine/trunk@21991 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/application_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ec9784575..1e62b878a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -876,9 +876,9 @@ module ApplicationHelper
@current_section = 0 if options[:edit_section_links]
parse_sections(text, project, obj, attr, only_path, options)
- text = parse_non_pre_blocks(text, obj, macros, options) do |text|
+ text = parse_non_pre_blocks(text, obj, macros, options) do |txt|
[:parse_inline_attachments, :parse_hires_images, :parse_wiki_links, :parse_redmine_links].each do |method_name|
- send method_name, text, project, obj, attr, only_path, options
+ send method_name, txt, project, obj, attr, only_path, options
end
end
parse_headings(text, project, obj, attr, only_path, options)