mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-17 05:44:13 +02:00
Code Issues Releases Wiki Activity

Rename user.isActivated

Browse Source
This commit is contained in:
Toby Zerner
2018-08-24 21:35:04 +09:30
parent d9d8162684
commit 70058652b5
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Serializer/CurrentUserSerializer.php
View File

@@ -22,7 +22,7 @@ class CurrentUserSerializer extends UserSerializer
$attributes = parent::getDefaultAttributes($user);
$attributes += [
'isActivated' => (bool) $user->is_email_confirmed,
'isEmailConfirmed' => (bool) $user->is_email_confirmed,
'email' => $user->email,
'readTime' => $this->formatDate($user->marked_all_as_read_at),
'unreadNotificationsCount' => (int) $user->getUnreadNotificationsCount(),

4
src/Api/Serializer/UserSerializer.php
View File

@@ -56,8 +56,8 @@ class UserSerializer extends BasicUserSerializer
if ($canEdit || $this->actor->id === $user->id) {
$attributes += [
'isActivated' => (bool) $user->is_email_confirmed,
'email' => $user->email
'isEmailConfirmed' => (bool) $user->is_email_confirmed,
'email' => $user->email
];
}

2
src/User/Command/EditUserHandler.php
View File

@@ -103,7 +103,7 @@ class EditUserHandler
}
}
if ($actor->isAdmin() && ! empty($attributes['isActivated'])) {
if ($actor->isAdmin() && ! empty($attributes['isEmailConfirmed'])) {
$user->activate();
}

2
src/User/Command/RegisterUserHandler.php
View File

@@ -112,7 +112,7 @@ class RegisterUserHandler
}
}
if ($actor->isAdmin() && array_get($data, 'attributes.isActivated')) {
if ($actor->isAdmin() && array_get($data, 'attributes.isEmailConfirmed')) {
$user->activate();
}