Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-03-16 14:58:39 -04:00
parent f7d1e58d65 da1858f674
commit 7f8f197e60
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins.js
View File

@@ -127,7 +127,6 @@ var middleware;
};
Plugins.reloadRoutes = function (callback) {
callback = callback || function () {};
var router = express.Router();
router.hotswapId = 'plugins';
@@ -138,7 +137,8 @@ var middleware;
var controllers = require('./controllers');
Plugins.fireHook('static:app.load', { app: app, router: router, middleware: middleware, controllers: controllers }, function (err) {
if (err) {
return winston.error('[plugins] Encountered error while executing post-router plugins hooks: ' + err.message);
winston.error('[plugins] Encountered error while executing post-router plugins hooks: ' + err.message);
return callback(err);
}
hotswap.replace('plugins', router);