Fixed: URL with ~ broken in wiki formatting.

All RedCloth quick phrase modifiers are now limited to a single line.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@796 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index c4b504871007cb60bfb0c06bdb2d22aed1bfc6e5..ae70db747868e1b915fa7fb3becf8babd17a9d2b 100644 (file)
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -359,16 +359,16 @@ class RedCloth < String
     ]
 
     QTAGS = [
-        ['**', 'b'],
-        ['*', 'strong'],
+        ['**', 'b', :limit],
+        ['*', 'strong', :limit],
         ['??', 'cite', :limit],
         ['-', 'del', :limit],
-        ['__', 'i'],
+        ['__', 'i', :limit],
         ['_', 'em', :limit],
         ['%', 'span', :limit],
         ['+', 'ins', :limit],
-        ['^', 'sup'],
-        ['~', 'sub']
+        ['^', 'sup', :limit],
+        ['~', 'sub', :limit]
     ] 
     QTAGS.collect! do |rc, ht, rtype|
         rcq = Regexp::quote rc

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 1da25b6fe136cffe860bf81bdcff3a0e8cac855a..0048ce5b84ee4dda01420e724a353f03bfb19a8f 100644 (file)
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -29,6 +29,7 @@ class ApplicationHelperTest < HelperTestCase
   def test_auto_links
     to_test = {
       'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
+      'http://foo.bar/~user' => '<a class="external" href="http://foo.bar/~user">http://foo.bar/~user</a>',
       'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
       'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
       'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',