Prevent unwanted textile link parsing at end of line.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1557 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
0223b87612
commit
f4e0c77c83
@ -786,7 +786,7 @@ class RedCloth < String
|
|||||||
\s?
|
\s?
|
||||||
(?:\(([^)]+?)\)(?="))? # $title
|
(?:\(([^)]+?)\)(?="))? # $title
|
||||||
":
|
":
|
||||||
(\S+?) # $url
|
([\w\/]\S+?) # $url
|
||||||
(\/)? # $slash
|
(\/)? # $slash
|
||||||
([^\w\/;]*?) # $post
|
([^\w\/;]*?) # $post
|
||||||
(?=<|\s|$)
|
(?=<|\s|$)
|
||||||
|
@ -59,6 +59,7 @@ class ApplicationHelperTest < HelperTestCase
|
|||||||
'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
|
'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
|
||||||
'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
|
'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
|
||||||
'"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
|
'"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
|
||||||
|
"This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
|
||||||
# no multiline link text
|
# 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<br />\nand another on a second line\":test"
|
"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"
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user