From eef63745e689bb5c0f5bcb8a5fedbba1b3ef45d0 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
---
src/Core/Command/RegisterUserHandler.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php
index 0629e4681..af5221b40 100644
--- a/src/Core/Command/RegisterUserHandler.php
+++ b/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 af36ef3fa9f6ec502385873f827c9bcde2354fe9 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
---
src/Core/Command/RegisterUserHandler.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php
index af5221b40..325fb1d61 100644
--- a/src/Core/Command/RegisterUserHandler.php
+++ b/src/Core/Command/RegisterUserHandler.php
@@ -1,4 +1,5 @@
<?php
+
/*
* This file is part of Flarum.
*
From 8e90d9f9e2c553870a78d44c743f446db6581a42 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
---
src/Core/Command/RegisterUserHandler.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php
index 325fb1d61..ba65e987a 100644
--- a/src/Core/Command/RegisterUserHandler.php
+++ b/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 24580ced7ac70cb525381c129d5857184d82aa85 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 :/
---
src/Core/Command/RegisterUserHandler.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php
index ba65e987a..811215ce9 100644
--- a/src/Core/Command/RegisterUserHandler.php
+++ b/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 258a4b352d22a12fe2f5686dd866e0a110bc3cd9 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 ===
---
src/Core/Command/RegisterUserHandler.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Core/Command/RegisterUserHandler.php b/src/Core/Command/RegisterUserHandler.php
index 811215ce9..e477902fa 100644
--- a/src/Core/Command/RegisterUserHandler.php
+++ b/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;
}
}