diff options
| author | alecpl <alec@alec.pl> | 2011-11-07 07:42:24 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-07 07:42:24 +0000 |
| commit | f2292c3a9513fd56c1d6ba0691612b935fafa4a3 (patch) | |
| tree | f0fa3e10fff70667c69639c550ca133fa77e82ca | |
| parent | 3b4b03d6b342075098d4cdd95bb131a00deed5b8 (diff) | |
- Fix handling of curly brackets in URLs (#1488168)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_string_replacer.php | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index 5d743bfff..8997ca342 100644 --- a/program/include/rcube_string_replacer.php +++ b/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 = "/(" |