Skip to content

Node.js based forum software built for the modern web

Merge branch 'master' into develop

Barış Soner Uşaklıc1b47fbf4d34
diff --cc src/controllers/admin/uploads.js
index 433edd07ce,ccd4261b36..74d1370de0
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@@@ -260,12 -258,8 +260,8 @@@ uploadsController.uploadMaskableIcon =
}
};
- uploadsController.uploadLogo = async function (req, res, next) {
- await upload('site-logo', req, res, next);
- };
-
uploadsController.uploadFile = async function (req, res, next) {
- const uploadedFile = req.files.files[0];
+ const uploadedFile = req.files[0];
let params;
try {
params = JSON.parse(req.body.params);
@@@ -296,8 -294,12 +296,12 @@@ uploadsController.uploadOgImage = asyn
};
async function upload(name, req, res, next) {
- const uploadedFile = req.files.files[0];
+ const uploadedFile = req.files[0];
+ if (uploadedFile.path.endsWith('.svg')) {
+ await sanitizeSvg(uploadedFile.path);
+ }
+
await validateUpload(uploadedFile, allowedImageTypes);
const filename = name + path.extname(uploadedFile.name);
await uploadImage(filename, 'system', uploadedFile, req, res, next);