Skip to content

Commit a0b5311

Browse files
authored
Fix error when validating user profile update (#37)
1 parent 98daa76 commit a0b5311

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Http/Controllers/CP/MembersController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Statamic\Http\Controllers\CP\Users\UsersController;
1717
use Statamic\Http\Requests\FilteredRequest;
1818
use Statamic\Support\Str;
19+
use Statamic\Rules\UniqueUserValue;
1920

2021
class MembersController extends UsersController
2122
{
@@ -212,7 +213,7 @@ public function update(Request $request, $user)
212213

213214
$fields = $user->blueprint()->fields()->except(['password'])->addValues($request->all());
214215

215-
$fields->validate(['email' => 'required|unique_user_value:'.$user->id()]);
216+
$fields->validate(['email' => 'required', new UniqueUserValue($user->id())]);
216217

217218
$values = $fields->process()->values()->except(['email', 'groups', 'roles']);
218219

src/Http/Controllers/UsersController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Statamic\Facades\User;
99
use Statamic\Forms\Uploaders\AssetsUploader;
1010
use Statamic\Support\Arr;
11+
use Statamic\Rules\UniqueUserValue;
1112

1213
class UsersController extends Controller
1314
{
@@ -26,7 +27,7 @@ public function profile(Request $request)
2627
$extraRules = $this->assetRules($fields);
2728
if ($only->contains('email')) {
2829
$extraRules = array_merge([
29-
'email' => ['required', 'unique_user_value:'.$user->id()],
30+
'email' => ['required', new UniqueUserValue($user->id())],
3031
], $extraRules);
3132
}
3233
$fieldRules = $fields->validator()->withRules($extraRules)->rules();

0 commit comments

Comments
 (0)