moved sync code out of async

src/user/picture.js

@@ -1,20 +1,20 @@
 'use strict';
 
-var async = require('async'),
+var async = require('async');
-	path = require('path'),
+var path = require('path');
-	fs = require('fs'),
+var fs = require('fs');
-	os = require('os'),
+var os = require('os');
-	nconf = require('nconf'),
+var nconf = require('nconf');
-	crypto = require('crypto'),
+var crypto = require('crypto');
-	winston = require('winston'),
+var winston = require('winston');
-	request = require('request'),
+var request = require('request');
-	mime = require('mime'),
+var mime = require('mime');
-
+
-	plugins = require('../plugins'),
+var plugins = require('../plugins');
-	file = require('../file'),
+var file = require('../file');
-	image = require('../image'),
+var image = require('../image');
-	meta = require('../meta'),
+var meta = require('../meta');
-	db = require('../database');
+var db = require('../database');
 
 module.exports = function(User) {
 
@@ -28,16 +28,19 @@ module.exports = function(User) {
 		var keepAllVersions = parseInt(meta.config['profile:keepAllUserImages'], 10) === 1;
 		var uploadedImage;
 
+		if (parseInt(meta.config.allowProfileImageUploads) !== 1) {
+			return callback(new Error('[[error:profile-image-uploads-disabled]]'));
+		}
+
+		if (picture.size > uploadSize * 1024) {
+			return callback(new Error('[[error:file-too-big, ' + uploadSize + ']]'));
+		}
+
+		if (!extension) {
+			return callback(new Error('[[error:invalid-image-extension]]'));
+		}
+
 		async.waterfall([
-			function(next) {
-				next(parseInt(meta.config.allowProfileImageUploads) !== 1 ? new Error('[[error:profile-image-uploads-disabled]]') : null);
-			},
-			function(next) {
-				next(picture.size > uploadSize * 1024 ? new Error('[[error:file-too-big, ' + uploadSize + ']]') : null);
-			},
-			function(next) {
-				next(!extension ? new Error('[[error:invalid-image-extension]]') : null);
-			},
 			function(next) {
 				if (plugins.hasListeners('filter:uploadImage')) {
 					return plugins.fireHook('filter:uploadImage', {image: picture, uid: updateUid}, next);