summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-04 06:52:12 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-10-04 06:52:12 +0000
commita20bbfe2cd08dd2ec0b9f640693e5eca0342874f (patch)
treec299446c7f299327442305fb5f29fc7ddbe12aa2 /roundcubemail
parent9abbfd09914f352505ec1739998e6c9281d4a050 (diff)
- Fix mailto optional params in plain text messages aren't handled (#1487026)
git-svn-id: https://svn.roundcube.net/trunk@4029 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/include/rcube_string_replacer.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 5d54de0f9..4ad602439 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -16,6 +16,7 @@ CHANGELOG Roundcube Webmail
- Fix: contact group input is empty when using rename action more than once on the same group record
- Fix "Server Error! (Not Found)" when using utils/save-pref action (#1487023)
- Fix handling of Thunderbird's vCards (#1487024)
+- Fix mailto optional params in plain text messages aren't handled (#1487026)
RELEASE 0.4.1
-------------
diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php
index 962ea04fe..1eed1bf3c 100644
--- a/roundcubemail/program/include/rcube_string_replacer.php
+++ b/roundcubemail/program/include/rcube_string_replacer.php
@@ -42,6 +42,7 @@ class rcube_string_replacer
$this->mailto_pattern = "/("
."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*" // local-part
."@([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z]{2,5}" // domain-part
+ ."(\?\S+)?" // e.g. ?subject=test...
.")/i";
}