jro_apps/redmine Commit - r1869:14b4afeec90a

Fixed: http links containing parentheses fail to reder correctly (#1591). Patch by Paul Rivier....

Jean-Philippe Lang -

r1869:14b4afeec90a

parent child

Context file:

r1869:14b4afeec90a

Collapse all files

lib/redcloth3.rb +8 -2

                         ":
                         ([\w\/]\S+?)               # $url
                         (\/)?                      # $slash
-                        ([^\w\/;]*?)               # $post
+                        ([^\w\=\/;\(\)]*?)         # $post
                         (?=<|\s|$)
                     /x
+            #"
                 def inline_textile_link( text )
                     text.gsub!( LINK_RE ) do |m|
                         pre,atts,text,title,url,slash,post = $~[1..7]
                         url, url_title = check_refs( url )
                         title ||= url_title
+                        # Idea below : an URL with unbalanced parethesis and
+                        # ending by ')' is put into external parenthesis
+                        if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) )
+                          url=url[0..-2] # discard closing parenth from url
+                          post = ")"+post # add closing parenth to post
+                        end
                         atts = pba( atts )
                         atts = " href=\"#{ url }#{ slash }\"#{ atts }"
                         atts << " title=\"#{ title }\"" if title

lib/redmine/wiki_formatting.rb +8 -2

                                       (\S+?)                   # url
                                       (\/)?                    # slash
                                     )
-                                    ([^\w\=\/;]*?)               # post
+                                    ([^\w\=\/;\(\)]*?)               # post
                                     (?=<|\s|$)
                                    }x unless const_defined?(:AUTO_LINK_RE)
                         # don't replace URL's that are already linked
                         # and URL's prefixed with ! !> !< != (textile images)
                         all
                       else
+                        # Idea below : an URL with unbalanced parethesis and
+                        # ending by ')' is put into external parenthesis
+                        if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) )
+                          url=url[0..-2] # discard closing parenth from url
+                          post = ")"+post # add closing parenth to post
+                        end
                         %(#{leading}<a class="external" href="#{proto=="www."?"http://www.":proto}#{url}">#{proto + url}</a>#{post})
                       end
                     end

test/unit/helpers/application_helper_test.rb +8 0

                   'This is a link: http://foo.bar.' => 'This is a link: <a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'A link (eg. http://foo.bar).' => 'A link (eg. <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>.',
+                  'http://www.foo.bar/Test_(foobar)' => '<a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>',
+                  '(see inline link : http://www.foo.bar/Test_(foobar))' => '(see inline link : <a class="external" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>)',
+                  '(see inline link : http://www.foo.bar/Test)' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>)',
+                  '(see inline link : http://www.foo.bar/Test).' => '(see inline link : <a class="external" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>).',
+                  '(see "inline link":http://www.foo.bar/Test_(foobar))' => '(see <a href="http://www.foo.bar/Test_(foobar)" class="external">inline link</a>)',
+                  '(see "inline link":http://www.foo.bar/Test)' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>)',
+                  '(see "inline link":http://www.foo.bar/Test).' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>).',
                   'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
                   'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
                   'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
                   'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
+                  'http://foo:bar@www.bar.com' => '<a class="external" href="http://foo:bar@www.bar.com">http://foo:bar@www.bar.com</a>',
                   'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages