github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1033 from dav-is/patch-2

Browse Source 
Prevent Overwriting of User's Attributes on Register (#897)
This commit is contained in:
Franz Liedke 2017-02-03 18:51:11 +01:00 committed by GitHub
commit d5ccc7392a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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