diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-04-21 12:49:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-04-21 12:49:16 +0000 |
| commit | 6bb550838777352180534da7a7f807cbf5f0db7f (patch) | |
| tree | df7f5e567ad5ba08cd1f5418cdfe22931ee5b415 | |
| parent | bb44430b631eba1d33b218c97cb5d506073aeb08 (diff) | |
| download | redmine-6bb550838777352180534da7a7f807cbf5f0db7f.tar.gz redmine-6bb550838777352180534da7a7f807cbf5f0db7f.zip | |
Less aggressive textile image tag parsing (#3209).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2677 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redcloth3.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index e0dca80e2..a4d33f804 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -907,7 +907,7 @@ class RedCloth3 < String end IMAGE_RE = / - (<p>|.|^) # start of line? + (<p>|\s|^) # start of line? \! # opening (\<|\=|\>)? # optional alignment atts (#{C}) # optional style,class atts diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index a8b7edea5..21ed10ae5 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -57,6 +57,8 @@ class ApplicationHelperTest < HelperTestCase 'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>', 'ftps://foo.bar' => '<a class="external" href="ftps://foo.bar">ftps://foo.bar</a>', 'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>', + # two exclamation marks + 'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>', } to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) } end @@ -110,6 +112,8 @@ class ApplicationHelperTest < HelperTestCase "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test", # mailto link "\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>", + # two exclamation marks + '"a link":http://example.net/path!602815048C7B5C20!302.html' => '<a href="http://example.net/path!602815048C7B5C20!302.html" class="external">a link</a>', } to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) } end |