mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '3.4' into 3.5
This commit is contained in:
commit
20e486690c
@ -322,7 +322,7 @@ class Email extends ViewableData {
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
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
|
||||
* @return bool
|
||||
*/
|
||||
public function IsEmail() {
|
||||
return true;
|
||||
|
Loading…
Reference in New Issue
Block a user