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

BUG Fix the password reset message to be shown consistently.

Browse Source 
If we detect any of the password reset GET params, it's safe to assume
that someone intended a password reset, regardless of other conditions.
This commit is contained in:
Mateusz Uzdowski 2013-10-25 09:29:21 +13:00
parent 7cf8e65309
commit 1a39f61598
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/Security.php
View File

@ -658,9 +658,8 @@ class Security extends Controller {
'Form' => $this->ChangePasswordForm())); 'Form' => $this->ChangePasswordForm()));
} else { } else {
// show an error message if the auto login token is invalid and the // Show friendly message if it seems like the user arrived here via password reset feature.
// user is not logged in if(isset($_REQUEST['m']) || isset($_REQUEST['t'])) {
if(!isset($_REQUEST['t']) || !$member) {
$customisedController = $controller->customise( $customisedController = $controller->customise(
array('Content' => array('Content' =>
_t( _t(