summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-05 10:28:24 +0000
committeralecpl <alec@alec.pl>2012-01-05 10:28:24 +0000
commitd69f8f06118afa8173975d7ea8a84e3c0c739ce8 (patch)
treeaa87f9b3661653acb514d64be8b4e4fd6b193c6a /program/steps
parenta33118fd0f0fa3765507b50bcb45cf44da1190bb (diff)
- Backported r5713
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/func.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 503a56b00..ab0605d46 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1084,15 +1084,13 @@ function rcmail_resolve_base($body)
// 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
*/