diff --git a/classes/log/Repository.php b/classes/log/Repository.php index fc7d3496885..a69b8f44fdc 100644 --- a/classes/log/Repository.php +++ b/classes/log/Repository.php @@ -1,4 +1,5 @@ where('user_id', $oldUserId) - ->whereNotIn('email_log_id', function ($query) use ($newUserId, $oldUserId) { - $query->select('t1.email_log_id') - ->from(DB::table('email_log_users')->as('t1')) - ->join(DB::table('email_log_users')->as('t2'), 't1.email_log_id', '=', 't2.email_log_id') - ->where('t1.user_id', $newUserId) - ->where('t2.user_id', $oldUserId); - })->update(['user_id' => $newUserId]) + ->whereNotIn('email_log_id', DB::table('email_log_users as t1') + ->select('t1.email_log_id') + ->join('email_log_users as t2', 't1.email_log_id', '=', 't2.email_log_id') + ->where('t1.user_id', $newUserId) + ->where('t2.user_id', $oldUserId) + ->pluck('t1.email_log_id') + ->toArray())->update(['user_id' => $newUserId]) ]; } diff --git a/classes/user/Repository.php b/classes/user/Repository.php index dab90795979..55d91d9997b 100644 --- a/classes/user/Repository.php +++ b/classes/user/Repository.php @@ -1,4 +1,5 @@ $newUserId, - 'userGroupId' => $userUserGroup->id, + 'userGroupId' => $userUserGroup->userGroupId, 'dateStart' => $userUserGroup->dateStart, 'dateEnd' => $userUserGroup->dateEnd, 'masthead' => $userUserGroup->masthead,