UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-20 00:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3803 from syntafin/dev

Browse source 
Fix Emoji Mime Type Validation
This commit is contained in:
daniel 2023-03-04 14:59:33 -07:00 committed by GitHub
commit b51bacf672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/AdminController.php
View file

@ -42,13 +42,13 @@ use App\Models\CustomEmoji;
class AdminController extends Controller class AdminController extends Controller
{ {
use AdminReportController, use AdminReportController,
AdminDirectoryController, AdminDirectoryController,
AdminDiscoverController, AdminDiscoverController,
AdminHashtagsController, AdminHashtagsController,
// AdminGroupsController, // AdminGroupsController,
AdminMediaController, AdminMediaController,
AdminSettingsController, AdminSettingsController,
AdminInstanceController, AdminInstanceController,
// AdminStorageController, // AdminStorageController,
AdminUserController; AdminUserController;
@ -523,7 +523,7 @@ class AdminController extends Controller
->whereShortcode($request->input('shortcode')); ->whereShortcode($request->input('shortcode'));
}) })
], ],
'emoji' => 'required|file|mimetypes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) 'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000)
]); ]);
$emoji = new CustomEmoji; $emoji = new CustomEmoji;