Fixed: inline images in wiki headings (#4112).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2999 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: inline images in wiki headings (#4112).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2999 e93f8b46-1217-0410-a6f0-8f06a7374b81
9943f64f · Jean-Philippe Lang · 03548f2d · 9943f64f · 9943f64f
Commit 9943f64f authored Nov 04, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

redcloth3.rb lib/redcloth3.rb +1 -1

application_helper_test.rb test/unit/helpers/application_helper_test.rb +13 -0

No files found.
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -912,7 +912,7 @@ class RedCloth3 < String
    end

    IMAGE_RE = /
-            (<p>|\s|^)           # start of line?
+            (>|\s|^)           # start of line?
            \!                   # opening
            (\<|\=|\>)?          # optional alignment atts
            (#{C})               # optional style,class atts

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -81,6 +81,19 @@ class ApplicationHelperTest < HelperTestCase
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
  end
  
+  def test_inline_images_inside_tags
+    raw = <<-RAW
+h1. !foo.png! Heading
+
+Centered image:
+
+p=. !bar.gif!
+RAW
+
+    assert textilizable(raw).include?('<img src="foo.png" alt="" />')
+    assert textilizable(raw).include?('<img src="bar.gif" alt="" />')
+  end
+  
  def test_acronyms
    to_test = {
      'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',