Merge branch 'master' of git://github.com/yiisoft/yii2

This commit is contained in:
Qiang Xue
2014-05-02 13:01:18 -04:00

View File

@@ -186,6 +186,10 @@ abstract class BaseMailer extends Component implements MailerInterface, ViewCont
if (isset($text)) { if (isset($text)) {
$message->setTextBody($text); $message->setTextBody($text);
} elseif (isset($html)) { } elseif (isset($html)) {
if (preg_match('|<body[^>]*>(.*?)</body>|is', $html, $match)) {
$html = $match[1];
}
$html = preg_replace('|<style[^>]*>(.*?)</style>|is', '', $html);
$message->setTextBody(strip_tags($html)); $message->setTextBody(strip_tags($html));
} }
} }