Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 12:01:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-03-06 20:53:51 -05:00
parent 30130b2d62 90b29031fe
commit e51016ee66
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins.js
View File

@@ -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();

2
src/routes/meta.js
View File

@@ -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)({

5
src/upgrade.js
View File

@@ -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)) {