jro_apps/redmine Commit - r11334:998a29cbaf24

Merged r11473 from trunk (#3676)....

Jean-Philippe Lang -

r11334:998a29cbaf24

parent child

Context file:

r11334:998a29cbaf24

lib/redmine/wiki_formatting.rb +1 -1

                                      (?:www\.)                # www.*
                                    )
                                    (
-                                     (\S+?)                   # url
+                                     ([^<]\S*?)               # url
                                      (\/)?                    # slash
                                    )
                                    ((?:&gt;)?|[^[:alnum:]_\=\/;\(\)]*?)               # post

test/unit/helpers/application_helper_test.rb +4 -1

                    # escaping
                    'http://foo"bar' => '<a class="external" href="http://foo&quot;bar">http://foo&quot;bar</a>',
                    # wrap in angle brackets
-                   '<http://foo.bar>' => '&lt;<a class="external" href="http://foo.bar">http://foo.bar</a>&gt;'
+                   '<http://foo.bar>' => '&lt;<a class="external" href="http://foo.bar">http://foo.bar</a>&gt;',
+                   # invalid urls
+                   'http://' => 'http://',
+                   'www.' => 'www.',
                  }
                  to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
                end

General Comments 0

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

No TODOs yet

	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