mirror of
https://github.com/flarum/framework.git
synced 2024-11-24 19:53:16 +08:00
Merge branch '0.1.0-beta.7'
This commit is contained in:
commit
2ac04aac8e
|
@ -104,9 +104,7 @@ 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'])) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user