Merge pull request #2607 from mateusz/fix-reset-message

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

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(