diff options
| author | alecpl <alec@alec.pl> | 2011-05-04 18:53:11 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-05-04 18:53:11 +0000 |
| commit | ba9c7b40f0dfcadf1d5711246e7b332ff7a60787 (patch) | |
| tree | 10d8bc0a125fe8bc29d33592a480e245c5627e21 /program/include/rcube_string_replacer.php | |
| parent | 4a7ed027e4d9b605060cecc9bd97bc3dd2c1889b (diff) | |
- Apply fixes from trunk (up to r4728)
Diffstat (limited to 'program/include/rcube_string_replacer.php')
| -rw-r--r-- | program/include/rcube_string_replacer.php | 3 |
1 files changed, 2 insertions, 1 deletions
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%=#@+?&\\/_~\\[\\]-'; |