From b427e46a10eae5cfe67ccde65cab0fc875eefc5c Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi <akagane99@gmail.com>
Date: Thu, 6 Mar 2025 11:40:56 +0900
Subject: [PATCH] =?UTF-8?q?change:=20=E7=A7=BB=E8=A1=8C=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=EF=BC=9E=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E7=A7=BB=E8=A1=8C,=20=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E3=83=A1=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=89=E3=83=AC?=
 =?UTF-8?q?=E3=82=B9=E3=81=8CRFC=E9=81=95=E5=8F=8D=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Traits/Migration/MigrationTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Traits/Migration/MigrationTrait.php b/app/Traits/Migration/MigrationTrait.php
index 45c9e3f79..ec8452c08 100644
--- a/app/Traits/Migration/MigrationTrait.php
+++ b/app/Traits/Migration/MigrationTrait.php
@@ -1774,7 +1774,7 @@ private function importUsers($redo)
                     try {
                         Validator::validate(['email' => $email], ['email' => ['email', 'nullable']]);
                     } catch (\Exception $e) {
-                        $this->putError(3, 'ユーザーのメールアドレスがRFC違反。', " userid = " . $user_item['userid'] . " name = " . $user_item['name'] . " email='" . $email . "' error = " . $e->getMessage());
+                        $this->putError(3, 'ユーザーのメールアドレスがRFC違反。（ユーザ移行はされますが、新システムではユーザ変更時の入力チェックでエラーになりますのでご留意ください。又、入力ミスしたメールアドレスや、;区切りの複数メールアドレスがある場合は、メールが届きませんのでご注意ください。）', " userid = " . $user_item['userid'] . " name = " . $user_item['name'] . " email='" . $email . "' error = " . $e->getMessage());
                     }
                 }
                 // emailの duplicate entry 制約があるので、空文字ならnull に変換