mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merged in Member::sendInfo() bug fixes from branches/2.3 - r85779
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86679 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
bf67f48aac
commit
8b6772fff0
@ -380,6 +380,7 @@ class Member extends DataObject {
|
||||
}
|
||||
|
||||
$e->populateTemplate($this);
|
||||
$e->setTo($this->Email);
|
||||
$e->send();
|
||||
}
|
||||
|
||||
@ -1324,11 +1325,11 @@ class Member_ProfileForm extends Form {
|
||||
*/
|
||||
class Member_SignupEmail extends Email {
|
||||
protected $from = ''; // setting a blank from address uses the site's default administrator email
|
||||
protected $to = '$Email';
|
||||
protected $subject = '';
|
||||
protected $body = '';
|
||||
|
||||
function __construct() {
|
||||
parent::__construct();
|
||||
$this->subject = _t('Member.EMAILSIGNUPSUBJECT', "Thanks for signing up");
|
||||
$this->body = '
|
||||
<h1>' . _t('Member.GREETING','Welcome') . ', $FirstName.</h1>
|
||||
@ -1384,9 +1385,9 @@ class Member_ChangePasswordEmail extends Email {
|
||||
protected $from = ''; // setting a blank from address uses the site's default administrator email
|
||||
protected $subject = '';
|
||||
protected $ss_template = 'ChangePasswordEmail';
|
||||
protected $to = '$Email';
|
||||
|
||||
function __construct() {
|
||||
parent::__construct();
|
||||
$this->subject = _t('Member.SUBJECTPASSWORDCHANGED', "Your password has been changed", PR_MEDIUM, 'Email subject');
|
||||
}
|
||||
}
|
||||
@ -1402,9 +1403,9 @@ class Member_ForgotPasswordEmail extends Email {
|
||||
protected $from = ''; // setting a blank from address uses the site's default administrator email
|
||||
protected $subject = '';
|
||||
protected $ss_template = 'ForgotPasswordEmail';
|
||||
protected $to = '$Email';
|
||||
|
||||
function __construct() {
|
||||
parent::__construct();
|
||||
$this->subject = _t('Member.SUBJECTPASSWORDRESET', "Your password reset link", PR_MEDIUM, 'Email subject');
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user