summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-27 06:25:13 +0000
committeralecpl <alec@alec.pl>2010-10-27 06:25:13 +0000
commitd21a05b48117ce7dbef4ad7997ed15c26bccf481 (patch)
treef7601b7d40a913c427fc8d9ac184bf199b4dd8b6 /program/include
parentacd9bdd25b62a45420b0aad49de2e31a42053132 (diff)
- Fix handling of URLs with semicolon (;) character (#1487088)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_string_replacer.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index a13de6aa3..e219f3083 100644
--- a/program/include/rcube_string_replacer.php
+++ b/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";
}