diff --git a/app/helpers/markdownify_helper.rb b/app/helpers/markdownify_helper.rb index a5356e2ec..a49ce2381 100644 --- a/app/helpers/markdownify_helper.rb +++ b/app/helpers/markdownify_helper.rb @@ -5,8 +5,7 @@ require File.expand_path("#{Rails.root}/lib/diaspora/markdownify") module MarkdownifyHelper - def markdownify(message, render_options={}) - return '' if message.blank? + def markdownify(target, render_options={}) markdown_options = { :autolink => true, @@ -19,8 +18,6 @@ module MarkdownifyHelper render_options[:filter_html] = true - renderer = Diaspora::Markdownify::HTML.new(render_options) - markdown = Redcarpet::Markdown.new(renderer, markdown_options) # This ugly little hack basically means # "Give me the rawest contents of target available" @@ -32,6 +29,11 @@ module MarkdownifyHelper message = target.to_s end + return '' if message.blank? + + renderer = Diaspora::Markdownify::HTML.new(render_options) + markdown = Redcarpet::Markdown.new(renderer, markdown_options) + message = markdown.render(message) if target.respond_to?(:format_mentions)