Merge pull request #7321 from pixelfed/fix/admin-directory-media-types-500

Fix AdminDirectoryController 500 on media_types validation
1 week ago · 6f9a7c1a88
parent f1effd1621 6c90810f4a
commit 6f9a7c1a88
1 changed files with 4 additions and 2 deletions
--- a/app/Http/Controllers/Admin/AdminDirectoryController.php
+++ b/app/Http/Controllers/Admin/AdminDirectoryController.php
@ -101,7 +101,8 @@ trait AdminDirectoryController
            'media_types' => [
                'required',
                function ($attribute, $value, $fail) {
-                    if (! in_array('image/jpeg', $value->toArray()) || ! in_array('image/png', $value->toArray())) {
+                    $types = is_array($value) ? $value : collect($value)->toArray();
+                    if (! in_array('image/jpeg', $types) || ! in_array('image/png', $types)) {
                        $fail('You must enable image/jpeg and image/png support.');
                    }
                },
@ -269,7 +270,8 @@ trait AdminDirectoryController
            'media_types' => [
                'required',
                function ($attribute, $value, $fail) {
-                    if (! in_array('image/jpeg', $value->toArray()) || ! in_array('image/png', $value->toArray())) {
+                    $types = is_array($value) ? $value : collect($value)->toArray();
+                    if (! in_array('image/jpeg', $types) || ! in_array('image/png', $types)) {
                        $fail('You must enable image/jpeg and image/png support.');
                    }
                },