Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
c284e9be
Commit
c284e9be
authored
Nov 07, 2019
by
Alexandre Morin
Browse files
Merge branch 'Support/2.5.X' into 'master'
Support/2.5.x See merge request
!349
parents
b3423126
f6778017
Pipeline
#5151
passed with stage
in 8 minutes and 43 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
VERSION.md
View file @
c284e9be
2.
5
2.
5
.1
src/bundle/auth/Controller/ForgotAccountTrait.php
View file @
c284e9be
...
...
@@ -175,7 +175,7 @@ trait ForgotAccountTrait
*/
private
function
checkOldToken
(
$userAccount
,
$token
)
{
if
(
empty
(
$userAccount
->
tokenDate
)
||
$userAccount
->
tokenDate
!=
$token
->
data
->
tokenDate
)
{
if
(
empty
(
$userAccount
->
tokenDate
)
||
$userAccount
->
tokenDate
->
getTimestamp
()
!=
$token
->
data
->
tokenDate
->
getTimestamp
()
)
{
throw
new
\
core\Exception\ForbiddenException
(
"Expired link"
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment