summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-02-05 08:25:22 +0000
committeralecpl <alec@alec.pl>2010-02-05 08:25:22 +0000
commitad18d63cc15d7b0a77a5d90dc9f8bd7476b90c8d (patch)
tree601c6107074bd3323191d9bee6822f98d6ab0312 /program/steps
parent8955ca63e3b92ce6f939170e53f4808eec7dce62 (diff)
- Fix handling of extended mailto links (with params) (#1486354)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/func.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 98653087f..e9adc1513 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1148,12 +1148,12 @@ function rcmail_alter_html_link($matches)
$attrib['href'] = "./bin/modcss.php?u=" . urlencode($attrib['href']) . "&amp;c=" . urlencode($GLOBALS['rcmail_html_container_id']);
$end = ' />';
}
- else if (preg_match("/^mailto:$EMAIL_ADDRESS_PATTERN/i", $attrib['href'], $mailto)) {
+ else if (preg_match('/^mailto:'.$EMAIL_ADDRESS_PATTERN.'(\?[^"\'>]+)?/i', $attrib['href'], $mailto)) {
$attrib['href'] = $mailto[0];
$attrib['onclick'] = sprintf(
"return %s.command('compose','%s',this)",
JS_OBJECT_NAME,
- JQ($mailto[1]));
+ JQ($mailto[1].$mailto[2]));
}
else if (!empty($attrib['href']) && $attrib['href'][0] != '#') {
$attrib['target'] = '_blank';