30099-fixed-30987.patch

Takenori TAKAKI, 2019-03-19 09:53

Download (1.23 KB)

View differences:

lib/redmine/wiki_formatting/textile/redcloth3.rb
1025 1025
        text.gsub!( /\r/, "\n" )
1026 1026
        text.gsub!( /\t/, '    ' )
1027 1027
        text.gsub!( /^ +$/, '' )
1028
        text.gsub!( /\n{3,}/, "\n\n" )
1029 1028
        text.gsub!( /"$/, "\" " )
1030 1029

  
1031 1030
        # if entire document is indented, flush
test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
622 622
    assert_equal expected.gsub(%r{[\r\n\t]}, ''), to_html(text).gsub(%r{[\r\n\t]}, '')
623 623
  end
624 624

  
625
  def test_should_not_clear_white_space_in_pre
626
    text = <<-STR
627
<pre>
628
  This is some text in pre
629

  
630

  
631
  two whitespace line avobe here.
632
</pre>
633
STR
634
    assert_equal text.chomp, to_html(text)
635
  end
636

  
625 637
  private
626 638

  
627 639
  def assert_html_output(to_test, expect_paragraph = true)