From f17fa3ca116619a3f7ad3a4e180e2c6a13c7314f Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 18 Jan 2016 14:02:28 -0500
Subject: [PATCH] minify flag not actually being used

---
 src/meta.js      | 2 +-
 src/meta/js.js   | 6 +++---
 src/webserver.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/meta.js b/src/meta.js
index 8438f9041b..fef6f5def7 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -62,7 +62,7 @@ var async = require('async'),
 			async.apply(plugins.reloadRoutes),
 			function(next) {
 				async.parallel([
-					async.apply(Meta.js.minify, false),
+					async.apply(Meta.js.minify),
 					async.apply(Meta.css.minify),
 					async.apply(Meta.sounds.init),
 					async.apply(Meta.templates.compile),
diff --git a/src/meta/js.js b/src/meta/js.js
index 936d1da988..bd3b18dbe6 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -123,7 +123,7 @@ module.exports = function(Meta) {
 		});
 	};
 
-	Meta.js.minify = function(minify, callback) {
+	Meta.js.minify = function(callback) {
 		if (nconf.get('isPrimary') === 'true') {
 			/**
 			 * Check if the parent process is running with the debug option --debug (or --debug-brk)
@@ -218,14 +218,14 @@ module.exports = function(Meta) {
 		});
 	};
 
-	Meta.js.getFromFile = function(minify, callback) {
+	Meta.js.getFromFile = function(callback) {
 		var scriptPath = path.join(__dirname, '../../public/nodebb.min.js'),
 			mapPath = path.join(__dirname, '../../public/nodebb.min.js.map'),
 			paths = [scriptPath];
 		file.exists(scriptPath, function(exists) {
 			if (!exists) {
 				winston.warn('[meta/js] No script file found on disk, re-minifying');
-				Meta.js.minify(minify, callback);
+				Meta.js.minify(callback);
 				return;
 			}
 
diff --git a/src/webserver.js b/src/webserver.js
index 8bbf914a40..a72794af65 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -92,7 +92,7 @@ function initializeNodeBB(callback) {
 		function(next) {
 			async.parallel([
 				async.apply(meta.templates.compile),
-				async.apply(!skipJS ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')),
+				async.apply(!skipJS ? meta.js.minify : meta.js.getFromFile),
 				async.apply(!skipLess ? meta.css.minify : meta.css.getFromFile),
 				async.apply(meta.sounds.init)
 			], next);