Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-09 00:36:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hashtalk' into hashtalk

Browse Source
This commit is contained in:
Julian Lam
2014-09-23 16:02:22 -04:00
parent 05e147b440 a0da73dabd
commit 50a7c42f15
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins.js
View File

@@ -144,8 +144,16 @@ var fs = require('fs'),
return callback(pluginPath.match('nodebb-theme') ? null : err);
}
var pluginData = JSON.parse(data),
libraryPath, staticDir;
try {
var pluginData = JSON.parse(data),
libraryPath, staticDir;
} catch (err) {
var pluginDir = pluginPath.split(path.sep);
pluginDir = pluginDir[pluginDir.length -1];
winston.error('[plugins/' + pluginDir + '] Plugin not loaded - please check its plugin.json for errors');
return callback();
}
/*
Starting v0.5.0, `minver` is deprecated in favour of `compatibility`.

6
src/posts.js
View File

@@ -343,7 +343,11 @@ var async = require('async'),
next(null, post);
});
}, callback);
}, function(err, posts) {
plugins.fireHook('filter:post.getPostSummaryByPids', {posts: posts, uid: uid}, function(err, postData) {
callback(err, postData.posts);
});
});
});
});
};