Merge branch 'plugins' of github.com:designcreateplay/NodeBB into plugins

v1.18.x
Julian Lam 12 years ago
commit c2d7bf87e9

@ -74,7 +74,7 @@ var fs = require('fs'),
var _self = this var _self = this
hookList = this.loadedHooks[hook]; hookList = this.loadedHooks[hook];
if(hookList && Array.isArray(hookList)) { if (hookList && Array.isArray(hookList)) {
if (global.env === 'development') console.log('Info: [plugins] Firing hook: \'' + hook + '\''); if (global.env === 'development') console.log('Info: [plugins] Firing hook: \'' + hook + '\'');
var hookType = hook.split(':')[0]; var hookType = hook.split(':')[0];
switch(hookType) { switch(hookType) {
@ -117,6 +117,10 @@ var fs = require('fs'),
// Do nothing... // Do nothing...
break; break;
} }
} else {
// Otherwise, this hook contains no methods
var returnVal = (Array.isArray(args) ? args[0] : args);
if (callback) callback(returnVal);
} }
}, },
isActive: function(id, callback) { isActive: function(id, callback) {

Loading…
Cancel
Save