From b25ca5b5089db250d64024078599e09d4095a7a0 Mon Sep 17 00:00:00 2001
From: Davis <connor0095@gmail.com>
Date: Tue, 13 Sep 2016 02:22:09 -0500
Subject: [PATCH 1/5] Prevent overwriting of user's attributes on register

---
 framework/core/src/Core/Command/RegisterUserHandler.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index 0629e4681..af5221b40 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -115,7 +115,9 @@ class RegisterUserHandler
         // from the get-go.
         if (isset($token)) {
             foreach ($token->payload as $k => $v) {
-                $user->$k = $v;
+                if ($user->$k == "" || !isset($user->$k)) {
+                    $user->$k = $v;
+                }
             }
 
             if (isset($token->payload['email'])) {

From 01762a17d8a814b0beb2bf4ae03bb9c6a2dfa320 Mon Sep 17 00:00:00 2001
From: Davis <connor0095@gmail.com>
Date: Tue, 13 Sep 2016 05:53:46 -0500
Subject: [PATCH 2/5] StyleCl and the space after <?php is annoying

---
 framework/core/src/Core/Command/RegisterUserHandler.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index af5221b40..325fb1d61 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

From 521d85ab0562cf4231730cbf13de0260bc606a66 Mon Sep 17 00:00:00 2001
From: Davis <connor0095@gmail.com>
Date: Tue, 13 Sep 2016 05:55:00 -0500
Subject: [PATCH 3/5] Anything for Stylecl's green check

---
 framework/core/src/Core/Command/RegisterUserHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index 325fb1d61..ba65e987a 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -116,7 +116,7 @@ class RegisterUserHandler
         // from the get-go.
         if (isset($token)) {
             foreach ($token->payload as $k => $v) {
-                if ($user->$k == "" || !isset($user->$k)) {
+                if ($user->$k == "" || ! isset($user->$k)) {
                     $user->$k = $v;
                 }
             }

From b8de47c0b2ad94fcd1a7ce3059a89885c6e8d740 Mon Sep 17 00:00:00 2001
From: Davis <connor0095@gmail.com>
Date: Tue, 13 Sep 2016 05:56:13 -0500
Subject: [PATCH 4/5] Wish it was automatic :/

---
 framework/core/src/Core/Command/RegisterUserHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index ba65e987a..811215ce9 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -116,7 +116,7 @@ class RegisterUserHandler
         // from the get-go.
         if (isset($token)) {
             foreach ($token->payload as $k => $v) {
-                if ($user->$k == "" || ! isset($user->$k)) {
+                if ($user->$k == '' || ! isset($user->$k)) {
                     $user->$k = $v;
                 }
             }

From 6750089ace30cb7f5225f395aa153108e76199b2 Mon Sep 17 00:00:00 2001
From: Davis <connor0095@gmail.com>
Date: Tue, 13 Sep 2016 14:48:21 -0500
Subject: [PATCH 5/5] Change == to ===

---
 framework/core/src/Core/Command/RegisterUserHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index 811215ce9..e477902fa 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -116,7 +116,7 @@ class RegisterUserHandler
         // from the get-go.
         if (isset($token)) {
             foreach ($token->payload as $k => $v) {
-                if ($user->$k == '' || ! isset($user->$k)) {
+                if ($user->$k === '' || ! isset($user->$k)) {
                     $user->$k = $v;
                 }
             }