closes #4295

src/controllers/uploads.js

@@ -46,15 +46,9 @@ uploadsController.upload = function(req, res, filesIterator, next) {
 uploadsController.uploadPost = function(req, res, next) {
 	uploadsController.upload(req, res, function(uploadedFile, next) {
 		if (uploadedFile.type.match(/image./)) {
-			file.isFileTypeAllowed(uploadedFile.path, function(err, tempPath) {
+			uploadImage(req.uid, uploadedFile, next);
-				if (err) {
-					return next(err);
-				}
-
-				uploadImage(req.user ? req.user.uid : 0, uploadedFile, next);
-			});
 		} else {
-			uploadFile(req.user ? req.user.uid : 0, uploadedFile, next);
+			uploadFile(req.uid, uploadedFile, next);
 		}
 	}, next);
 };
@@ -82,7 +76,7 @@ uploadsController.uploadThumb = function(req, res, next) {
 					if (err) {
 						return next(err);
 					}
-					uploadImage(req.user ? req.user.uid : 0, uploadedFile, next);
+					uploadImage(req.uid, uploadedFile, next);
 				});
 			} else {
 				next(new Error('[[error:invalid-file]]'));
@@ -108,11 +102,16 @@ function uploadImage(uid, image, callback) {
 		return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback);
 	}
 
-	if (parseInt(meta.config.allowFileUploads, 10)) {
+	file.isFileTypeAllowed(image.path, function(err, tempPath) {
-		uploadFile(uid, image, callback);
+		if (err) {
-	} else {
+			return callback(err);
-		callback(new Error('[[error:uploads-are-disabled]]'));
+		}
-	}
+		if (parseInt(meta.config.allowFileUploads, 10)) {
+			uploadFile(uid, image, callback);
+		} else {
+			callback(new Error('[[error:uploads-are-disabled]]'));
+		}
+	});
 }
 
 function uploadFile(uid, uploadedFile, callback) {