mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 00:01:17 +02:00
Code Issues Releases Wiki Activity

Merge branch '0.1.0-beta.7'

Browse Source
This commit is contained in:
Toby Zerner
2018-01-06 20:06:43 +10:30
parent 6df4e63910 31b925164c
commit a8f792c34b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,10 +104,8 @@ class RegisterUserHandler
// from the get-go. // from the get-go.
if (isset($token)) { if (isset($token)) {
foreach ($token->payload as $k => $v) { foreach ($token->payload as $k => $v) {
if (in_array($user->$k, ['', null], true)) {
$user->$k = $v; $user->$k = $v;
} }
}
if (isset($token->payload['email'])) { if (isset($token->payload['email'])) {
$user->activate(); $user->activate();