summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-09-10 06:49:51 +0000
committeralecpl <alec@alec.pl>2011-09-10 06:49:51 +0000
commit303ade533f4056400a8976418d06946de012b7b5 (patch)
treea2c4751a0c8341b9dffed5b1880c627e88bcd56d
parentbe392fe1a202a159dc298f9209e22a46d966795e (diff)
- Fix handling of links with IP address
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_string_replacer.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1a301f469..c50dca637 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix handling of links with IP address
- Fix compacting folder resets message list filter (#1488076)
- Fix displaying multipart/alternative messages with only one part (#1487938)
- Rewritten messages caching:
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 5ce986fcb..5d743bfff 100644
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -37,7 +37,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,})';
+ $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})';
$url1 = '.:;,';
$url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-';