summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/redcloth3.rb2
-rw-r--r--test/unit/helpers/application_helper_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index b96ee7ab0..31051fa96 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -973,7 +973,7 @@ class RedCloth3 < String
if stln == "<p>"
out = "<p style=\"float:#{ algn }\">#{ out }"
else
- out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
+ out = "#{ stln }<span style=\"float:#{ algn }\">#{ out }</span>"
end
else
out = stln + out
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 35a9b8ce2..89af800be 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -116,7 +116,7 @@ class ApplicationHelperTest < ActionView::TestCase
def test_inline_images
to_test = {
'!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
- 'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
+ 'floating !>http://foo.bar/image.jpg!' => 'floating <span style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></span>',
'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
'with style !{width:100px;height:100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height:100px;" alt="" />',
'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',