Revised BC name field checking

rydurham · Dec 18, 2014 · 26108d6 · 26108d6
1 parent e7a6d4f
commit 26108d6
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/Sentinel/Repo/User/SentryUser.php b/src/Sentinel/Repo/User/SentryUser.php
@@ -39,8 +39,15 @@ public function store($data)
         try {
 
             // Check for firstName or lastName values for backwards compatibility
-            $data['first_name'] = (isset($data['firstName']) ? $data['firstName'] : $data['first_name']);
-            $data['last_name']  = (isset($data['lastName']) ? $data['lastName'] : $data['last_name']);
+            if (isset($data['firstName']) || isset($data['first_name']))
+            {
+                $data['first_name'] = (isset($data['firstName']) ? $data['firstName'] : $data['first_name']);
+            }
+
+            if (isset($data['lastName']) || isset($data['last_name']))
+            {
+                $data['last_name']  = (isset($data['lastName']) ? $data['lastName'] : $data['last_name']);
+            }
 
             // Check to see if activation has been disabled in the config.
             if ($this->config->has('Sentinel::config.activation'))
@@ -132,8 +139,15 @@ public function update($data)
             $user = $this->sentry->findUserById($data['id']);
 
             // Check for firstName or lastName values for backwards compatibility
-            $data['first_name'] = (isset($data['firstName']) ? $data['firstName'] : $data['first_name']);
-            $data['last_name']  = (isset($data['lastName']) ? $data['lastName'] : $data['last_name']);
+            if (isset($data['firstName']) || isset($data['first_name']))
+            {
+                $data['first_name'] = (isset($data['firstName']) ? $data['firstName'] : $data['first_name']);
+            }
+
+            if (isset($data['lastName']) || isset($data['last_name']))
+            {
+                $data['last_name']  = (isset($data['lastName']) ? $data['lastName'] : $data['last_name']);
+            }
 
             // Update the user details
             $user->first_name = e($data['first_name']);