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 pull request #2607 from mateusz/fix-reset-message

Browse Source 
BUG Fix the password reset message to be shown consistently.
This commit is contained in:
Sean Harvey 2013-10-24 14:42:08 -07:00
commit 91e96ec1c0
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()));
} else {
// show an error message if the auto login token is invalid and the
// user is not logged in
if(!isset($_REQUEST['t']) || !$member) {
// Show friendly message if it seems like the user arrived here via password reset feature.
if(isset($_REQUEST['m']) || isset($_REQUEST['t'])) {
$customisedController = $controller->customise(
array('Content' =>
_t(