allow <> to surround the url (like () or [])

diff --git a/lib/util.php b/lib/util.php
index 31a78a876a529f253318148348f151cbe3b15fdf..ed7e10f6bd465b5bdaa350413b008022a9ed6a82 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -422,7 +422,7 @@ function common_render_text($text)
 function common_replace_urls_callback($text, $callback, $notice_id = null) {
     // Start off with a regex
     $regex = '#'.
-    '(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
+    '(?:^|[\s\<\>\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
     '('.
         '(?:'.
             '(?:'. //Known protocols
@@ -480,6 +480,10 @@ function callback_helper($matches, $callback, $notice_id) {
         array(
             'left'=>'{',
             'right'=>'}'
+        ),
+        array(
+            'left'=>'<',
+            'right'=>'>'
         )
     );
     $cannotEndWith=array('.','?',',','#');