From ba9c7b40f0dfcadf1d5711246e7b332ff7a60787 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 4 May 2011 18:53:11 +0000 Subject: - Apply fixes from trunk (up to r4728) --- program/include/rcube_string_replacer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'program/include/rcube_string_replacer.php') diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index 8fcbecaba..ec40156d2 100644 --- a/program/include/rcube_string_replacer.php +++ b/program/include/rcube_string_replacer.php @@ -36,7 +36,8 @@ class rcube_string_replacer function __construct() { // Simplified domain expression for UTF8 characters handling - $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}'; + // 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 = '.:;'; $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-'; -- cgit v1.2.3