From 96e24fab880754858dfe9d3864d400102209918f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 27 Jun 2011 09:30:01 +0000
Subject: - Fix parsing URLs containing commas (#1487970)

---
 CHANGELOG                                 | 1 +
 program/include/rcube_string_replacer.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6ffcb95fa..5de0766ff 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 3c09326b2..5ce986fcb 100644
--- a/program/include/rcube_string_replacer.php
+++ b/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";
-- 
cgit v1.2.3