mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 09:26:34 +02:00
Code Issues 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 17257aacaf
commit d5ebbab3a7
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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