tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4' into 3.5

Browse Source
This commit is contained in:
Daniel Hensby 2017-01-17 11:37:13 +00:00
commit 20e486690c
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
email/Email.php
View File

@ -322,7 +322,7 @@ class Email extends ViewableData {
/** /**
* Set the "Reply-To" header with an email address. * Set the "Reply-To" header with an email address.
* *
* @param string $val * @param string $val The email address of the "Reply-To" header
* @return $this * @return $this
*/ */
public function setReplyTo($val) { public function setReplyTo($val) {
@ -432,6 +432,7 @@ class Email extends ViewableData {
/** /**
* Used by {@link SSViewer} templates to detect if we're rendering an email template rather than a page template * Used by {@link SSViewer} templates to detect if we're rendering an email template rather than a page template
* @return bool
*/ */
public function IsEmail() { public function IsEmail() {
return true; return true;