github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-06 06:43:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename dead is_activated references with the new is_email_confirmed (#1974)

Browse Source
This commit is contained in:
Clark Winkelmann 2020-02-14 15:34:32 +01:00 committed by GitHub
parent e28ef06435
commit 4350baa1f1
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Api/Controller/SendConfirmationEmailController.php
View File

@ -71,7 +71,7 @@ class SendConfirmationEmailController implements RequestHandlerInterface
$this->assertRegistered($actor); $this->assertRegistered($actor);
if ($actor->id != $id || $actor->is_activated) { if ($actor->id != $id || $actor->is_email_confirmed) {
throw new PermissionDeniedException; throw new PermissionDeniedException;
} }

4
framework/core/src/User/Command/ConfirmEmailHandler.php
View File

@ -44,9 +44,7 @@ class ConfirmEmailHandler
$user = $token->user; $user = $token->user;
$user->changeEmail($token->email); $user->changeEmail($token->email);
if (! $user->is_activated) { $user->activate();
$user->activate();
}
$user->save(); $user->save();
$this->dispatchEventsFor($user); $this->dispatchEventsFor($user);

2
framework/core/tests/integration/api/users/CreationTest.php
View File

@ -111,7 +111,7 @@ class CreationTest extends TestCase
/** @var User $user */ /** @var User $user */
$user = User::where('username', 'test')->firstOrFail(); $user = User::where('username', 'test')->firstOrFail();
$this->assertEquals(0, $user->is_activated); $this->assertEquals(0, $user->is_email_confirmed);
$this->assertEquals('test', $user->username); $this->assertEquals('test', $user->username);
$this->assertEquals('test@machine.local', $user->email); $this->assertEquals('test@machine.local', $user->email);
} }