Skip to content

O
OHR Support
Commit 58623106 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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
parent cb8bee3a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
lib/redcloth.rb
View file @ 58623106
......@@ -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
......
test/unit/helpers/application_helper_test.rb
View file @ 58623106
......@@ -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>',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment