diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-05-26 19:39:51 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-05-26 19:39:51 +0000 |
| commit | aa87a73e413070799f450f496ad7a9d57a84a5a0 (patch) | |
| tree | 4a74740a9d6a65f5a40b5dce1cf49f2769dce651 | |
| parent | 54138d2b1771d31b14aa3007974451888fd3a8c4 (diff) | |
| download | redmine-aa87a73e413070799f450f496ad7a9d57a84a5a0.tar.gz redmine-aa87a73e413070799f450f496ad7a9d57a84a5a0.zip | |
No multiline text for textile links.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1463 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redcloth.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/redcloth.rb b/lib/redcloth.rb index f94c95738..fb6a053c6 100644 --- a/lib/redcloth.rb +++ b/lib/redcloth.rb @@ -764,7 +764,7 @@ class RedCloth < String ([\s\[{(]|[#{PUNCT}])? # $pre " # start (#{C}) # $atts - ([^"]+?) # $text + ([^"\n]+?) # $text \s? (?:\(([^)]+?)\)(?="))? # $title ": diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 8866e8cde..3c1eac020 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -45,7 +45,7 @@ module Redmine # Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet. # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a> def hard_break( text ) - text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks + text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />\n" ) if hard_breaks end # Patch to add code highlighting support to RedCloth diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 25559ebc1..ffee28b00 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -58,7 +58,9 @@ class ApplicationHelperTest < HelperTestCase to_test = { '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>', - '"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>', + # 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" } to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) } end |