summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-04 06:52:12 +0000
committeralecpl <alec@alec.pl>2010-10-04 06:52:12 +0000
commitdf2188d778cb9bd89ca118c03850ef7f9fc86ce7 (patch)
tree6db6c261fec3074c35b504561a2b7f05f2c13cd0
parent928bcaedc0013a7b653647750108a8ab2c37d2a6 (diff)
- Fix mailto optional params in plain text messages aren't handled (#1487026)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_string_replacer.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5d54de0f9..4ad602439 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 962ea04fe..1eed1bf3c 100644
--- a/program/include/rcube_string_replacer.php
+++ b/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";
}