Merged r2270, r2344, r2359, r2360, r2362, r2363, r2415, r2423, r2424 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2026-07-13 21:03:04 +02:00 · 2009-02-09 18:46:00 +00:00
parent fae04f3ae1
commit bc4249e3d3
15 changed files with 24 additions and 20 deletions
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -792,7 +792,7 @@ class RedCloth3 < String
            (?:\(([^)]+?)\)(?="))?     # $title
            ":
            (                          # $url
-            (\/|https?:\/\/|s?ftps?:\/\/|www\.)
+            (\/|[a-zA-Z]+:\/\/|www\.)  # $proto
            [\w\/]\S+?
            )               
            (\/)?                      # $slash