Merge remote-tracking branch 'origin/master'

app.js

@@ -291,7 +291,7 @@ function activate() {
 
 		winston.info('Activating plugin %s', plugin);
 
-		db.sortedSetAdd('plugins:active', plugin, 1, start);
+		db.sortedSetAdd('plugins:active', 0, plugin, start);
 	});
 }
 

src/controllers/admin/themes.js

@@ -6,7 +6,7 @@ var fs = require('fs');
 var themesController = {};
 
 themesController.get = function(req, res, next) {
-	var themeDir = path.join(__dirname, '../../node_modules/' + req.params.theme);
+	var themeDir = path.join(__dirname, '../../../node_modules/' + req.params.theme);
 	fs.exists(themeDir, function(exists) {
 		if (exists) {
 			var themeConfig = require(path.join(themeDir, 'theme.json')),
@@ -14,7 +14,7 @@ themesController.get = function(req, res, next) {
 			if (themeConfig.screenshot && fs.existsSync(screenshotPath)) {
 				res.sendFile(screenshotPath);
 			} else {
-				res.sendFile(path.join(__dirname, '../../public/images/themes/default.png'));
+				res.sendFile(path.join(__dirname, '../../../public/images/themes/default.png'));
 			}
 		} else {
 			return next();

src/socket.io/admin.js

@@ -89,9 +89,7 @@ SocketAdmin.themes.set = function(socket, data, callback) {
 	}
 
 	var wrappedCallback = function(err) {
-		meta.themes.set(data, function() {
+		meta.themes.set(data, callback);
-			callback();
-		});
 	};
 	if (data.type === 'bootswatch') {
 		wrappedCallback();