From acd9bdd25b62a45420b0aad49de2e31a42053132 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 26 Oct 2010 13:41:16 -0400
Subject: [PATCH] - Fix handling of URLs with tilde (~) character (#1487087)
---
CHANGELOG | 1 +
program/include/rcube_string_replacer.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9478fc0..e916325 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@
- 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/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 326bb7f..a13de6a 100644
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -37,7 +37,7 @@
{
// 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 = "/("
--
Gitblit v1.9.1