Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-21 06:53:08 +01:00
Code Issues Packages Projects Releases Activity

Merged r23519 from trunk to 6.0-stable (#42326).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23524 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2025-03-07 07:42:08 +00:00
parent d8e945ca8e
commit 01557f9fc6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/wiki_formatting/macros.rb
View File

@@ -53,7 +53,7 @@ module Redmine
send(method_name, obj, args)
end
rescue => e
%|<div class="flash error">#{::I18n.t(:error_can_not_execute_macro_html, :name => name, :error => e.to_s)}</div>|.html_safe
%|<div class="flash error">#{::I18n.t(:error_can_not_execute_macro_html, :name => ::ERB::Util.h(name), :error => ::ERB::Util.h(e.to_s))}</div>|.html_safe
end
end

4
test/unit/lib/redmine/wiki_formatting/macros_test.rb
View File

@@ -140,12 +140,12 @@ class Redmine::WikiFormatting::MacrosTest < Redmine::HelperTest
def test_macro_exception_should_be_displayed
Redmine::WikiFormatting::Macros.macro :exception do |obj, args|
raise "My message"
raise "My exception's message"
end
text = "{{exception}}"
assert_include(
'<div class="flash error">Error executing the <strong>exception</strong> macro (My message)</div>',
'<div class="flash error">Error executing the <strong>exception</strong> macro (My exception&#39;s message)</div>',
textilizable(text)
)
end