diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-07 07:42:24 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-07 07:42:24 +0000 |
| commit | 82f361d8df4cb40d59ff8eaa50cdf8876aea79fa (patch) | |
| tree | b7e82de3b1e23e498849a6774cc5cfa6f0fee5a0 /roundcubemail | |
| parent | 8ffa9922f2757230239118d0cdafb6782874885e (diff) | |
- Fix handling of curly brackets in URLs (#1488168)
git-svn-id: https://svn.roundcube.net/trunk@5394 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_string_replacer.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index d218710b3..0e72c41e8 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix handling of curly brackets in URLs (#1488168) - Fix handling of dates (birthday/anniversary) in contact data (#1488147) - Fix error on opening searched LDAP contact (#1488144) - Fix redundant line break in flowed format (#1488146) diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php index 5d743bfff..8997ca342 100644 --- a/roundcubemail/program/include/rcube_string_replacer.php +++ b/roundcubemail/program/include/rcube_string_replacer.php @@ -39,7 +39,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-z0-9]{2,})'; $url1 = '.:;,'; - $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-'; + $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]{}-'; $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain([$url1]?[$url2]+)*)/i"; $this->mailto_pattern = "/(" |