From: Jean-Philippe Lang Date: Mon, 16 Jun 2008 19:37:09 +0000 (+0000) Subject: Prevent unwanted textile link parsing at end of line. X-Git-Tag: 0.8.0-RC1~437 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f4e0c77c8357958e713466c000e135e321600249;p=redmine.git Prevent unwanted textile link parsing at end of line. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1557 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redcloth.rb b/lib/redcloth.rb index 42eddd8e0..59d02fbab 100644 --- a/lib/redcloth.rb +++ b/lib/redcloth.rb @@ -786,7 +786,7 @@ class RedCloth < String \s? (?:\(([^)]+?)\)(?="))? # $title ": - (\S+?) # $url + ([\w\/]\S+?) # $url (\/)? # $slash ([^\w\/;]*?) # $post (?=<|\s|$) diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 7fa96d7e2..c6afdda0e 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -59,6 +59,7 @@ class ApplicationHelperTest < HelperTestCase 'This is a "link":http://foo.bar' => 'This is a link', 'This is an intern "link":/foo/bar' => 'This is an intern link', '"link (Link title)":http://foo.bar' => 'link', + "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":

\n\n\n\t

Another paragraph", # no multiline link text "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
\nand another on a second line\":test" }