From d69f8f06118afa8173975d7ea8a84e3c0c739ce8 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Thu, 05 Jan 2012 05:28:24 -0500 Subject: [PATCH] - Backported r5713 --- program/steps/mail/func.inc | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 503a56b..ab0605d 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1084,15 +1084,13 @@ // check for <base href=...> if (preg_match('!(<base.*href=["\']?)([hftps]{3,5}://[a-z0-9/.%-]+)!i', $body, $regs)) { $replacer = new rcube_base_replacer($regs[2]); - - // replace all relative paths - $body = preg_replace_callback('/(src|background|href)=(["\']?)([^"\'\s]+)(\2|\s|>)/Ui', array($replacer, 'callback'), $body); - $body = preg_replace_callback('/(url\s*\()(["\']?)([^"\'\)\s]+)(\2)\)/Ui', array($replacer, 'callback'), $body); + $body = $replacer->replace($body); } return $body; } + /** * modify a HTML message that it can be displayed inside a HTML page */ -- Gitblit v1.9.1