- Fix handling of URLs with semicolon (;) character (#1487088)

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

1 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php
index a13de6aa3..e219f3083 100644
--- a/roundcubemail/program/include/rcube_string_replacer.php
+++ b/roundcubemail/program/include/rcube_string_replacer.php
@@ -37,13 +37,13 @@ class rcube_string_replacer
   {
     // Simplified domain expression for UTF8 characters handling
     $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}';
-    $url = '[a-z0-9%=#+?.:&\\/_~-]+';
+    $url = '[a-z0-9%=#@+?.:;&\\/_~-]+';
 
     $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain($url)?)/i";
     $this->mailto_pattern = "/("
         ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
         ."@$utf_domain"                                                 // domain-part
-        ."(\?$url)?"                                                     // e.g. ?subject=test...
+        ."(\?$url)?"                                                    // e.g. ?subject=test...
         .")/i";
   }