From 2b00670e4d204db24b9e38dd5e7a8d72aa7470bc Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 23 Mar 2023 04:45:19 +0000 Subject: [PATCH] Use Commonmarker instead of Redcarpet by default when rendering Markdown attachments (#36807, #38372). Patch by Mizuki ISHIKAWA. git-svn-id: https://svn.redmine.org/redmine/trunk@22146 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 6 +++--- test/helpers/application_helper_test.rb | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 43f32fbc7..3177d0eb7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1855,10 +1855,10 @@ module ApplicationHelper # Returns the markdown formatter: markdown or common_mark # ToDo: Remove this when markdown will be removed def markdown_formatter - if Setting.text_formatting == "common_mark" - "common_mark" - else + if Setting.text_formatting == "markdown" "markdown" + else + "common_mark" end end diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index fc0351885..ddc55dcb8 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -2229,6 +2229,20 @@ class ApplicationHelperTest < Redmine::HelperTest end end + # TODO: Remove this test when Redcarpet-based Markdown formatter is removed + def test_markdown_formatter + [ + ['markdown', 'markdown'], + ['common_mark', 'common_mark'], + ['textile', 'common_mark'], + ['', 'common_mark'] + ].each do |text_formatting, expected| + with_settings text_formatting: text_formatting do + assert_equal expected, markdown_formatter + end + end + end + private def wiki_links_with_special_characters -- 2.39.5