Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-07 08:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2733

Browse Source
This commit is contained in:
psychobunny
2015-02-17 15:12:31 -05:00
parent 8f6b577bad
commit 0611b7e1ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/admin/uploads.js
View File

@@ -30,7 +30,7 @@ uploadsController.uploadFavicon = function(req, res, next) {
var uploadedFile = req.files.files[0];
var allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon'];
if (validateUpload(res, req, next, uploadedFile, allowedTypes)) {
if (validateUpload(req, res, next, uploadedFile, allowedTypes)) {
file.saveFileToLocal('favicon.ico', 'files', uploadedFile.path, function(err, image) {
fs.unlink(uploadedFile.path);
if (err) {
@@ -63,7 +63,7 @@ function validateUpload(req, res, next, uploadedFile, allowedTypes) {
if (allowedTypes.indexOf(uploadedFile.type) === -1) {
fs.unlink(uploadedFile.path);
next(new Error('[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]'));
res.json({error: '[[error:invalid-image-type, ' + allowedTypes.join(', ') + ']]'});
return false;
}