summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-26 17:41:16 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-26 17:41:16 +0000
commit7949d7bc1c519e14aa295afb7d3e3c9daf3f9e3c (patch)
tree66a2ea1ec7fe4e99ce064ee4fa64ff5b54bd87cb
parentccaf87a6af04d71c98864c761856ba24339febe6 (diff)
- Fix handling of URLs with tilde (~) character (#1487087)
git-svn-id: https://svn.roundcube.net/trunk@4141 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/include/rcube_string_replacer.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 9478fc0f5..e916325aa 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -51,6 +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)
RELEASE 0.4.2
-------------
diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php
index 326bb7f51..a13de6aa3 100644
--- a/roundcubemail/program/include/rcube_string_replacer.php
+++ b/roundcubemail/program/include/rcube_string_replacer.php
@@ -37,7 +37,7 @@ 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 = "/("