diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-08-14 23:36:55 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-08-14 23:36:55 +0200 |
| commit | 341fa8b9a6207000d057e00678d96ada6136f783 (patch) | |
| tree | f8049ade80bf816e6b9d4d843b6e83a8b132e72a /program/lib/Roundcube/rcube_string_replacer.php | |
| parent | 96c4b9098bec7191c708d4e4f96b80b2768a7ef0 (diff) | |
| parent | f4ba655a41bad1d2f833e36dd3fbe7cb2a5582ee (diff) | |
Merge branch 'release-0.9' of github.com:roundcube/roundcubemail into release-0.9
Diffstat (limited to 'program/lib/Roundcube/rcube_string_replacer.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_string_replacer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php index acdc4e317..bd26f8e7d 100644 --- a/program/lib/Roundcube/rcube_string_replacer.php +++ b/program/lib/Roundcube/rcube_string_replacer.php @@ -36,7 +36,7 @@ class rcube_string_replacer // Support unicode/punycode in top-level domain part $utf_domain = '[^?&@"\'\\/()<>\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})'; $url1 = '.:;,'; - $url2 = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]\\(\\){}\*-'; + $url2 = 'a-zA-Z0-9%=#$@+?|!&\\/_~\\[\\]\\(\\){}\*-'; $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]*[$url2]+)*)/"; $this->mailto_pattern = "/(" |