Error202
/
yii2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

tags/2.0.0-rc
Qiang Xue 10 years ago
parent
93beb5e130 124c7e8448
commit
2c8570a9b7
3 changed files with 7 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      apps/advanced/common/mail/layouts/html.php
  2. 5
      apps/basic/mail/layouts/html.php
  3. 2
      docs/guide/tutorial-mailing.md

5
apps/advanced/common/mail/layouts/html.php
Unescape View File

@ -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>

5
apps/basic/mail/layouts/html.php
Unescape View File

@ -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>

2
docs/guide/tutorial-mailing.md
Unescape View File

@ -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 {...}

Write Preview
Loading…
Cancel
Save