Skip to content

Y
yii2
Commit 2c8570a9 by Qiang Xue
Options

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

parents 93beb5e1 124c7e84
Showing with 7 additions and 5 deletions
apps/advanced/common/mail/layouts/html.php
...@@ -3,14 +3,15 @@ use yii\helpers\Html; ...@@ -3,14 +3,15 @@ use yii\helpers\Html;
/** /**
* @var \yii\web\View $this * @var \yii\web\View $this
* @var \yii\mail\BaseMessage $content * @var \yii\mail\MessageInterface $message
* @var string $content
*/ */
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?= $message->getCharset() ?>" />
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head() ?> <?php $this->head() ?>
</head> </head>
......
apps/basic/mail/layouts/html.php
...@@ -3,14 +3,15 @@ use yii\helpers\Html; ...@@ -3,14 +3,15 @@ use yii\helpers\Html;
/** /**
* @var \yii\web\View $this * @var \yii\web\View $this
* @var \yii\mail\BaseMessage $content * @var \yii\mail\MessageInterface $message
* @var string $content
*/ */
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?= $message->getCharset() ?>" />
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head() ?> <?php $this->head() ?>
</head> </head>
......
docs/guide/tutorial-mailing.md
...@@ -150,7 +150,7 @@ use yii\helpers\Html; ...@@ -150,7 +150,7 @@ use yii\helpers\Html;
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=<?= $message->charset ?>" /> <meta http-equiv="Content-Type" content="text/html; charset=<?= $message->getCharset() ?>" />
<style type="text/css"> <style type="text/css">
.heading {...} .heading {...}
.list {...} .list {...}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment