diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-27 06:25:13 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-27 06:25:13 +0000 |
| commit | 756be8ec4ecb039474f33a79e1810f022c70e7d9 (patch) | |
| tree | c0cf631805c07c06cbc2bea89605fe0ffbd74e9e | |
| parent | 7949d7bc1c519e14aa295afb7d3e3c9daf3f9e3c (diff) | |
- Fix handling of URLs with semicolon (;) character (#1487088)
git-svn-id: https://svn.roundcube.net/trunk@4142 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 2 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_string_replacer.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index e916325aa..f6788bc7d 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -51,7 +51,7 @@ CHANGELOG Roundcube Webmail - Add basic IMAP LIST's \Noselect option support - Add support for selection options from LIST-EXTENDED extension (RFC 5258) - Don't list subscribed but non-existent folders (#1486225) -- Fix handling of URLs with tilde (~) character (#1487087) +- Fix handling of URLs with tilde (~) or semicolon (;) character (#1487087, #1487088) RELEASE 0.4.2 ------------- diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php index a13de6aa3..e219f3083 100644 --- a/roundcubemail/program/include/rcube_string_replacer.php +++ b/roundcubemail/program/include/rcube_string_replacer.php @@ -37,13 +37,13 @@ class rcube_string_replacer { // Simplified domain expression for UTF8 characters handling $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}'; - $url = '[a-z0-9%=#+?.:&\\/_~-]+'; + $url = '[a-z0-9%=#@+?.:;&\\/_~-]+'; $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain($url)?)/i"; $this->mailto_pattern = "/(" ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*" // local-part ."@$utf_domain" // domain-part - ."(\?$url)?" // e.g. ?subject=test... + ."(\?$url)?" // e.g. ?subject=test... .")/i"; } |