allow both `.png` and `png`
This commit is contained in:
barisusakli
2015-12-28 15:38:02 +02:00
parent 77b9406841
commit 99d64db9e0
2 changed files with 35 additions and 15 deletions

View File

@@ -1,19 +1,18 @@
"use strict";
var uploadsController = {},
var fs = require('fs');
var path = require('path');
var async = require('async');
var nconf = require('nconf');
var validator = require('validator');
var winston = require('winston');
fs = require('fs'),
path = require('path'),
async = require('async'),
nconf = require('nconf'),
validator = require('validator'),
meta = require('../meta'),
file = require('../file'),
plugins = require('../plugins'),
utils = require('../../public/src/utils'),
image = require('../image');
var meta = require('../meta');
var file = require('../file');
var plugins = require('../plugins');
var image = require('../image');
var uploadsController = {};
uploadsController.upload = function(req, res, filesIterator, next) {
var files = req.files.files;
@@ -126,8 +125,8 @@ function uploadFile(uid, uploadedFile, callback) {
}
if (meta.config.hasOwnProperty('allowedFileExtensions')) {
var allowed = meta.config.allowedFileExtensions.split(',').filter(Boolean);
var extension = path.extname(uploadedFile.name).slice(1);
var allowed = file.allowedExtensions();
var extension = path.extname(uploadedFile.name);
if (allowed.length > 0 && allowed.indexOf(extension) === -1) {
return callback(new Error('[[error:invalid-file-type, ' + allowed.join(', ') + ']]'));
}