Merge branch 'master' of https://github.com/designcreateplay/NodeBB

src/plugins.js

@@ -198,8 +198,18 @@ var fs = require('fs'),
 						}
 
 						Plugins.cssFiles = Plugins.cssFiles.concat(pluginData.css.map(function(file) {
-							return path.join(pluginData.id, file);
-						}));
+							if (fs.existsSync(path.join(__dirname, '../node_modules', pluginData.id, file))) {
+								return path.join(pluginData.id, file);
+							} else {
+								// Backwards compatibility with < v0.4.0, remove this for v0.5.0
+								if (pluginData.staticDir) {
+									return path.join(pluginData.id, pluginData.staticDir, file);
+								} else {
+									winston.error('[plugins/' + pluginData.id + '] This plugin\'s CSS is incorrectly configured, please contact the plugin author.');
+									return null;
+								}
+							}
+						}).filter(function(path) { return path }));	// Filter out nulls, remove this for v0.5.0
 					}
 
 					next();

src/routes/meta.js

@@ -28,7 +28,7 @@ var path = require('path'),
 
 				// ... and for each CSS file
 				for(x=0,numCSS=plugins.cssFiles.length;x<numCSS;x++) {
-					source += '\n@import (less) "./' + plugins.cssFiles[x] + '";';
+					source += '\n@import (inline) "./' + plugins.cssFiles[x] + '";';
 				}
 
 				var	parser = new (less.Parser)({

src/upgrade.js

@@ -223,8 +223,11 @@ Upgrade.upgrade = function(callback) {
 					}
 
 					db.getListRange('categories:cid', 0, -1, function(err, cids) {
+						// Naive type-checking, becaue DBAL does not have .type() support
 						if(err) {
-							return next(err);
+							// Most likely upgraded already. Skip.
+							winston.info('[2014/2/22] Added categories to sorted set - skipped');
+							return Upgrade.update(thisSchemaDate, next);
 						}
 
 						if(!Array.isArray(cids)) {