1
0
mirror of https://github.com/flarum/core.git synced 2025-07-19 15:51:16 +02:00

Merge branch '0.1.0-beta.7'

This commit is contained in:
Toby Zerner
2018-01-06 20:06:43 +10:30

View File

@@ -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'])) {