- Fix parsing URLs containing commas (#1487970)

git-svn-id: https://svn.roundcube.net/trunk@4881 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 2 insertions, 1 deletions

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 6ffcb95fa..5de0766ff 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix parsing URLs containing commas (#1487970)
 - Added vertical splitter for books/groups list in addressbook (#1487923)
 - Improved namespace roots handling in folder manager
 - Added searching in all addressbook sources
diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php
index 3c09326b2..5ce986fcb 100644
--- a/roundcubemail/program/include/rcube_string_replacer.php
+++ b/roundcubemail/program/include/rcube_string_replacer.php
@@ -38,7 +38,7 @@ class rcube_string_replacer
     // Simplified domain expression for UTF8 characters handling
     // Support unicode/punycode in top-level domain part
     $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})';
-    $url1 = '.:;';
+    $url1 = '.:;,';
     $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-';
 
     $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain([$url1]?[$url2]+)*)/i";