From 552a63367d8a811059768be9089ed081dee27768 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 6 Mar 2014 19:48:38 -0500
Subject: [PATCH 1/2] workaround for problem arising from switch to Date.UTC()

---
 src/upgrade.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/upgrade.js b/src/upgrade.js
index 12e7e610ab..9421180bf0 100644
--- a/src/upgrade.js
+++ b/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)) {

From 90b29031febbfbf93c84bdbf7e6051edebbc1ef2 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 6 Mar 2014 20:36:05 -0500
Subject: [PATCH 2/2] backwards compatibility with older plugins using css with
 staticDir

---
 src/plugins.js     | 14 ++++++++++++--
 src/routes/meta.js |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/plugins.js b/src/plugins.js
index 32d902b03b..d861f972fb 100644
--- a/src/plugins.js
+++ b/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();
diff --git a/src/routes/meta.js b/src/routes/meta.js
index 3b5fbed3f7..0629bc25a7 100644
--- a/src/routes/meta.js
+++ b/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)({