diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-04 09:56:53 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-04 09:56:53 +0000 |
| commit | f2ad8df5ddddc054b584f8862f0bf8b2be6b0a8c (patch) | |
| tree | 39e8669c931817250e0310c181b5576f791671d5 | |
| parent | ee408687c61d66a7d70fec636292cf5e8e66e3e0 (diff) | |
| download | redmine-f2ad8df5ddddc054b584f8862f0bf8b2be6b0a8c.tar.gz redmine-f2ad8df5ddddc054b584f8862f0bf8b2be6b0a8c.zip | |
Merged r15442 (#22898).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15445 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redcloth3.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 2 |
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 0b09a39ad..d2235398e 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" />', |