diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-10-18 12:14:02 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-10-18 12:14:02 +0200 |
| commit | 9f0ca2dca669a3f379d8582f128b7cca7056a921 (patch) | |
| tree | a425c936d4d6fb5ffb27e5dde5bd468437238b3a /program/steps/mail/func.inc | |
| parent | 7ea292410644af4b6eaa772a8f71855783ade0ae (diff) | |
| parent | 22c67d0ec28f4c9488d26aa35151392a18c74c45 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 5 |
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); |