Render markdown attachments using markdown or common_mark based on the text formattin...

Patch by Marius BĂLTEANU and Martin Cizek.

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0db89544108303512ae9ba9fa83f85d8651acdaa..0618b614d484947a985d77e07a12556ac1ff9e7e 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1837,6 +1837,16 @@ module ApplicationHelper
     )
   end
 
+  # 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
+      "markdown"
+    end
+  end
+
   private
 
   def wiki_helper

diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index b59f9446f75a8357541d0c22a2e74f195e51cb0e..f8f90df87b651f7c93c0f3b63b9d76b52622a6b8 100644 (file)
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -92,7 +92,7 @@ module AttachmentsHelper
 
   def render_file_content(attachment, content)
     if attachment.is_markdown?
-      render :partial => 'common/markup', :locals => {:markup_text_formatting => 'markdown', :markup_text => content}
+      render :partial => 'common/markup', :locals => {:markup_text_formatting => markdown_formatter, :markup_text => content}
     elsif attachment.is_textile?
       render :partial => 'common/markup', :locals => {:markup_text_formatting => 'textile', :markup_text => content}
     else

diff --git a/app/views/repositories/entry.html.erb b/app/views/repositories/entry.html.erb
index 4f8678beabad2e5fa71f5409218cbccebbf44a31..831e8044a11c80c7a884bb5d65d3257e102da014 100644 (file)
--- a/app/views/repositories/entry.html.erb
+++ b/app/views/repositories/entry.html.erb
@@ -13,7 +13,7 @@
 <% elsif Redmine::MimeType.of(@path) == 'text/x-textile' %>
   <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => 'textile', :markup_text => @content} %>
 <% elsif Redmine::MimeType.of(@path) == 'text/markdown' %>
-  <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => 'markdown', :markup_text => @content} %>
+  <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => markdown_formatter, :markup_text => @content} %>
 <% elsif @content %>
   <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
 <% else %>