mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.11' into 4
This commit is contained in:
commit
6c5448b70f
@ -25,6 +25,7 @@
|
|||||||
"bramus/monolog-colored-line-formatter": "^2",
|
"bramus/monolog-colored-line-formatter": "^2",
|
||||||
"composer/installers": "^1 || ^2",
|
"composer/installers": "^1 || ^2",
|
||||||
"composer/semver": "^1 || ^3",
|
"composer/semver": "^1 || ^3",
|
||||||
|
"guzzlehttp/guzzle": "^7",
|
||||||
"guzzlehttp/psr7": "^2",
|
"guzzlehttp/psr7": "^2",
|
||||||
"embed/embed": "^4",
|
"embed/embed": "^4",
|
||||||
"league/csv": "^8 || ^9",
|
"league/csv": "^8 || ^9",
|
||||||
|
@ -914,7 +914,7 @@ class Member extends DataObject
|
|||||||
&& static::config()->get('notify_password_change')
|
&& static::config()->get('notify_password_change')
|
||||||
&& $this->isInDB()
|
&& $this->isInDB()
|
||||||
) {
|
) {
|
||||||
Email::create()
|
$email = Email::create()
|
||||||
->setHTMLTemplate('SilverStripe\\Control\\Email\\ChangePasswordEmail')
|
->setHTMLTemplate('SilverStripe\\Control\\Email\\ChangePasswordEmail')
|
||||||
->setData($this)
|
->setData($this)
|
||||||
->setTo($this->Email)
|
->setTo($this->Email)
|
||||||
@ -922,8 +922,10 @@ class Member extends DataObject
|
|||||||
__CLASS__ . '.SUBJECTPASSWORDCHANGED',
|
__CLASS__ . '.SUBJECTPASSWORDCHANGED',
|
||||||
"Your password has been changed",
|
"Your password has been changed",
|
||||||
'Email subject'
|
'Email subject'
|
||||||
))
|
));
|
||||||
->send();
|
|
||||||
|
$this->extend('updateChangedPasswordEmail', $email);
|
||||||
|
$email->send();
|
||||||
}
|
}
|
||||||
|
|
||||||
// The test on $this->ID is used for when records are initially created. Note that this only works with
|
// The test on $this->ID is used for when records are initially created. Note that this only works with
|
||||||
|
@ -242,6 +242,8 @@ class LostPasswordHandler extends RequestHandler
|
|||||||
))
|
))
|
||||||
->addData('PasswordResetLink', Security::getPasswordResetLink($member, $token))
|
->addData('PasswordResetLink', Security::getPasswordResetLink($member, $token))
|
||||||
->setTo($member->Email);
|
->setTo($member->Email);
|
||||||
|
|
||||||
|
$member->extend('updateForgotPasswordEmail', $email);
|
||||||
return $email->send();
|
return $email->send();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user