Imported Upstream version 0.5.3+dfsg

[roundcube.git] / program / include / rcube_string_replacer.php

diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 0a0564673ae6386127d723b2947ab4034571494d..525571df9e9b06952843266c666754c99777a6ae 100644 (file)
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: rcube_string_replacer.php 4402 2011-01-10 14:50:48Z thomasb $
+ $Id: rcube_string_replacer.php 4729 2011-05-04 18:53:11Z alec $
 
 */
 
@@ -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%=#@+?&\\/_~\\[\\]-';