Replaces two more occurrences of CommonMarker (#40197).

git-svn-id: https://svn.redmine.org/redmine/trunk@23251 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/preparation.rb b/lib/redmine/preparation.rb
index 1aeb81e46bed7e1274deab597e46d5a47749e990..822662e11fb1095ac6f6b8d83fb76528b4afdf71 100644 (file)
--- a/lib/redmine/preparation.rb
+++ b/lib/redmine/preparation.rb
@@ -408,7 +408,7 @@ module Redmine
 
       WikiFormatting.map do |format|
         format.register :textile
-        if Object.const_defined?(:CommonMarker)
+        if Object.const_defined?(:Commonmarker)
           format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored)'
         end
       end

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 3ffa24281a2f9bf53578e6c0406a98d3034fa068..fabaa31ed60840f0f7b576775da4d1007a9db30b 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -1669,7 +1669,7 @@ class ApplicationHelperTest < Redmine::HelperTest
     end
   end
 
-  if Object.const_defined?(:CommonMarker)
+  if Object.const_defined?(:Commonmarker)
     def test_toc_with_markdown_formatting_should_be_parsed
       with_settings :text_formatting => 'common_mark' do
         assert_select_in textilizable("{{toc}}\n\n# Heading"), 'ul.toc li', :text => 'Heading'