From 22c67d0ec28f4c9488d26aa35151392a18c74c45 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 18 Oct 2012 10:49:58 +0200 Subject: Fix handling of URLs with asterisk characters (#1488759) --- program/steps/mail/func.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'program/steps/mail/func.inc') 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); -- cgit v1.2.3