From f81614fdc7b691f9d98ab99b0c5e14f9f9dffe03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <david@sudomail.ne.jp>
Date: Wed, 20 Jun 2018 18:00:40 +0900
Subject: [PATCH] Email and new password checks are separate now.

---
 app/Http/Controllers/UserController.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 812b358..fe8a6da 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -439,16 +439,15 @@ class UserController extends Controller {
                     DB::table('users')
                         ->where('id', $request->id)
                         ->update([
-                            'email' => $request->email,
                             'password' => $request->newPassword
                        ]);
                 }
-                else {
+                if (isset($request->email)) {
                     DB::table('users')
                         ->where('id', $request->id)
                         ->update([
                             'email' => $request->email
-                       ]);
+                        ]);
                 }
 
                 DB::table('usr_contacts')