jro_apps/redmine Commit - r4980:7db930f1b44b

Fixed: Wiki headings containing backslash followed by a digit are not displayed correctly (#7846)....

Jean-Philippe Lang -

r4980:7db930f1b44b

parent child

Context file:

r4980:7db930f1b44b

lib/redcloth3.rb +4 -2

                         atts = pba( atts )
                         # pass to prefix handler
+                        replacement = nil
                         if respond_to? "textile_#{ tag }", true
-                            text.gsub!( $&, method( "textile_#{ tag }" ).call( tag, atts, cite, content ) )
+                          replacement = method( "textile_#{ tag }" ).call( tag, atts, cite, content )
                         elsif respond_to? "textile_#{ tagpre }_", true
-                            text.gsub!( $&, method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content ) )
+                          replacement = method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content )
                         end
+                        text.gsub!( $& ) { replacement } if replacement
                     end
                 end

test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +9 -3

                   '@<Location /redmine>@'    => '<code>&lt;Location /redmine&gt;</code>'
                 )
               end
               def test_escaping
                 assert_html_output(
                   'this is a <script>'      => 'this is a &lt;script&gt;'
                 )
               end
+              def test_use_of_backslashes_followed_by_numbers_in_headers
+                assert_html_output({
+                  'h1. 2009\02\09'      => '<h1>2009\02\09</h1>'
+                }, false)
+              end
               def test_double_dashes_should_not_strikethrough
                 assert_html_output(
               private
-              def assert_html_output(to_test)
+              def assert_html_output(to_test, expect_paragraph = true)
                 to_test.each do |text, expected|
-                  assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html, "Formatting the following text failed:\n===\n#{text}\n===\n"
+                  assert_equal(( expect_paragraph ? "<p>#{expected}</p>" : expected ), @formatter.new(text).to_html, "Formatting the following text failed:\n===\n#{text}\n===\n")
                 end
               end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages