Skip to content

Commit 0d7b45e

Browse files
committed
Merge branch '8.x' into 9.x
# Conflicts: # CHANGELOG-8.x.md # src/Illuminate/Foundation/Application.php # tests/Database/DatabaseSchemaBlueprintIntegrationTest.php
2 parents a4308ec + e1afe08 commit 0d7b45e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Illuminate/Foundation/Auth/EmailVerificationRequest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ class EmailVerificationRequest extends FormRequest
1414
*/
1515
public function authorize()
1616
{
17-
if (! hash_equals((string) $this->route('id'),
18-
(string) $this->user()->getKey())) {
17+
if (! hash_equals((string) $this->user()->getKey(),
18+
(string) $this->route('id'))) {
1919
return false;
2020
}
2121

22-
if (! hash_equals((string) $this->route('hash'),
23-
sha1($this->user()->getEmailForVerification()))) {
22+
if (! hash_equals(sha1($this->user()->getEmailForVerification()),
23+
(string) $this->route('hash'))) {
2424
return false;
2525
}
2626

0 commit comments

Comments
 (0)