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

Contributed by Etienne Massip. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5100 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: Wiki headings containing backslash followed by a digit are not displayed correctly (#7846).
Contributed by Etienne Massip. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5100 e93f8b46-1217-0410-a6f0-8f06a7374b81
9a5a1385 · Jean-Philippe Lang · Eric Davis · 1b05ca5a · 9a5a1385 · 9a5a1385
Commit 9a5a1385 authored Mar 12, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 5 deletions

redcloth3.rb lib/redcloth3.rb +4 -2

textile_formatter_test.rb ...nit/lib/redmine/wiki_formatting/textile_formatter_test.rb +9 -3

No files found.
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -707,11 +707,13 @@ class RedCloth3 < String
            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
    

--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -64,12 +64,18 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
      '@<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(
@@ -88,9 +94,9 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
  
  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