From 1996e64c9b47fd54f4fdeefae801e1ef8f2a969d Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 1 Jan 2014 14:38:12 -0500
Subject: [PATCH] if imgur client id is not set but local file uploads are
 enabled use that

---
 public/src/modules/composer.js |  3 +--
 src/posts.js                   | 36 ++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 192a707142..f148dc2d49 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -94,9 +94,8 @@ define(['taskbar'], function(taskbar) {
 
 			var postContainer = $(composerTemplate[0]);
 
-			if(config.imgurClientIDSet) {
+			if(config.allowFileUploads || config.imgurClientIDSet)
 				initializeFileReader(post_uuid);
-			}
 
 			var postData = composer.posts[post_uuid],
 				titleEl = postContainer.find('.title'),
diff --git a/src/posts.js b/src/posts.js
index 0eb19b4a24..0ab4222321 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -360,24 +360,26 @@ var db = require('./database'),
 
 	Posts.uploadPostImage = function(image, callback) {
 
-		if(!meta.config.imgurClientID) {
-			return callback('imgurClientID not set', null);
-		}
+		if(meta.config.imgurClientID) {
+			if(!image) {
+				return callback('invalid image', null);
+			}
 
-		if(!image) {
-			return callback('invalid image', null);
+			require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
+				if(err) {
+					callback(err.message, null);
+				} else {
+					callback(null, {
+						url: data.link,
+						name: image.name
+					});
+				}
+			});
+		} else if (meta.config.allowFileUploads) {
+			Posts.uploadPostFile(image, callback);
+		} else {
+			callback('Uploads are disabled!');
 		}
-
-		require('./imgur').upload(meta.config.imgurClientID, image.data, 'base64', function(err, data) {
-			if(err) {
-				callback(err.message, null);
-			} else {
-				callback(null, {
-					url: data.link,
-					name: image.name
-				});
-			}
-		});
 	}
 
 	Posts.uploadPostFile = function(file, callback) {
@@ -400,7 +402,7 @@ var db = require('./database'),
 		var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), filename);
 
 		fs.writeFile(uploadPath, buffer, function (err) {
-  			if(err) {
+			if(err) {
 				callback(err.message, null);
 			} else {
 				callback(null, {