Harmonize, clarify, categorize URL schemes

Regular expression + avoid-redirection list now match each other.
2016-01-24 12:47:31 +01:00
parent 1cec627d72
commit a9d18a077e
2 changed files with 7 additions and 2 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -885,7 +885,7 @@ function common_replace_urls_callback($text, $callback, $arg = null) {
                '(?:'.
                    '(?:(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|ircs?)://)'.
                    '|'.
-                    '(?:(?:bitcoin|mailto|aim|tel|xmpp):)'.
+                    '(?:(?:aim|bitcoin|fax|jabber|mailto|tel|xmpp):)'.
                ')'.
                '(?:[\pN\pL\-\_\+\%\~]+(?::[\pN\pL\-\_\+\%\~]+)?\@)?'. //user:pass@
                '(?:'.