argument fix for static/action hooks

v1.18.x
barisusakli 10 years ago
parent 163b70fba9
commit 3063da83ef

@ -55,12 +55,8 @@ module.exports = function(Plugins) {
callback = typeof callback === 'function' ? callback : function() {}; callback = typeof callback === 'function' ? callback : function() {};
var hookList = Plugins.loadedHooks[hook]; var hookList = Plugins.loadedHooks[hook];
if (!Array.isArray(hookList) || !hookList.length) {
return callback(null, params);
}
var hookType = hook.split(':')[0]; var hookType = hook.split(':')[0];
switch (hookType) { switch (hookType) {
case 'filter': case 'filter':
fireFilterHook(hook, hookList, params, callback); fireFilterHook(hook, hookList, params, callback);
@ -78,6 +74,10 @@ module.exports = function(Plugins) {
}; };
function fireFilterHook(hook, hookList, params, callback) { function fireFilterHook(hook, hookList, params, callback) {
if (!Array.isArray(hookList) || !hookList.length) {
return callback(null, params);
}
async.reduce(hookList, params, function(params, hookObj, next) { async.reduce(hookList, params, function(params, hookObj, next) {
if (typeof hookObj.method !== 'function') { if (typeof hookObj.method !== 'function') {
if (global.env === 'development') { if (global.env === 'development') {
@ -98,6 +98,9 @@ module.exports = function(Plugins) {
} }
function fireActionHook(hook, hookList, params, callback) { function fireActionHook(hook, hookList, params, callback) {
if (!Array.isArray(hookList) || !hookList.length) {
return callback();
}
async.each(hookList, function(hookObj, next) { async.each(hookList, function(hookObj, next) {
if (typeof hookObj.method !== 'function') { if (typeof hookObj.method !== 'function') {
@ -113,6 +116,9 @@ module.exports = function(Plugins) {
} }
function fireStaticHook(hook, hookList, params, callback) { function fireStaticHook(hook, hookList, params, callback) {
if (!Array.isArray(hookList) || !hookList.length) {
return callback();
}
async.each(hookList, function(hookObj, next) { async.each(hookList, function(hookObj, next) {
if (typeof hookObj.method === 'function') { if (typeof hookObj.method === 'function') {
var timedOut = false; var timedOut = false;

@ -106,7 +106,7 @@ function initializeNodeBB(callback) {
middleware: middleware middleware: middleware
}, next); }, next);
}, },
function(results, next) { function(next) {
routes(app, middleware); routes(app, middleware);
next(); next();
} }

Loading…
Cancel
Save