diff --git a/app/models/chunks/engines.rb b/app/models/chunks/engines.rb index c9bacf96..da8b5ed8 100644 --- a/app/models/chunks/engines.rb +++ b/app/models/chunks/engines.rb @@ -43,7 +43,7 @@ module Engines class Mixed < AbstractEngine def mask - RedCloth.new(@content, [:hard_breaks] + @content.options[:engine_opts]).to_html( + RedCloth.new(@content, @content.options[:engine_opts]).to_html( :textile, :markdown) end end @@ -54,6 +54,6 @@ module Engines end end - MAP = { :textile => Textile, :markdown => Markdown, :mixed => Mixed, :rdoc => RDoc, } + MAP = { :textile => Textile, :markdown => Markdown, :mixed => Mixed, :rdoc => RDoc } MAP.default = Textile end diff --git a/test/unit/revision_test.rb b/test/unit/revision_test.rb index ae6784ef..941161c6 100755 --- a/test/unit/revision_test.rb +++ b/test/unit/revision_test.rb @@ -104,7 +104,9 @@ class RevisionTest < Test::Unit::TestCase @web.markup = :mixed assert_markup_parsed_as( - "

Markdown heading

\n\n\n\t

Textile heading

", + "

Markdown heading

\n\n\n\t

Textile heading

\n\n\n\t" + + "

some text with styles

\n\n\n\t" + + "", textile_and_markdown) end