summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-18 10:49:58 +0200
committerAleksander Machniak <alec@alec.pl>2012-10-18 10:49:58 +0200
commit22c67d0ec28f4c9488d26aa35151392a18c74c45 (patch)
tree3782a57f4e86c760d3ab7f721736c4771212cfc1 /program/steps/mail
parent043880738ae1489b87eb63b94729fa6112e3c67f (diff)
Fix handling of URLs with asterisk characters (#1488759)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index c21202588..39bccac16 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -786,9 +786,8 @@ function rcmail_plain_body($body, $flowed=false)
// make links and email-addresses clickable
$replacer = new rcube_string_replacer;
- // search for patterns like links and e-mail addresses
- $body = preg_replace_callback($replacer->link_pattern, array($replacer, 'link_callback'), $body);
- $body = preg_replace_callback($replacer->mailto_pattern, array($replacer, 'mailto_callback'), $body);
+ // search for patterns like links and e-mail addresses and replace with tokens
+ $body = $replacer->replace($body);
// split body into single lines
$body = preg_split('/\r?\n/', $body);