From 2c28e181471c351a73c3bc54de32db4e9826ed85 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 9 Mar 2016 14:53:32 +0200 Subject: [PATCH] closes #4332 --- src/plugins.js | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index 21c67e9303..853c6f44f2 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -1,23 +1,23 @@ 'use strict'; -var fs = require('fs'), - path = require('path'), - async = require('async'), - winston = require('winston'), - semver = require('semver'), - express = require('express'), - nconf = require('nconf'), +var fs = require('fs'); +var path = require('path'); +var async = require('async'); +var winston = require('winston'); +var semver = require('semver'); +var express = require('express'); +var nconf = require('nconf'); - db = require('./database'), - emitter = require('./emitter'), - meta = require('./meta'), - translator = require('../public/src/modules/translator'), - utils = require('../public/src/utils'), - hotswap = require('./hotswap'), - file = require('./file'), +var db = require('./database'); +var emitter = require('./emitter'); +var translator = require('../public/src/modules/translator'); +var utils = require('../public/src/utils'); +var hotswap = require('./hotswap'); +var file = require('./file'); - controllers = require('./controllers'), - app, middleware; +var controllers = require('./controllers'); +var app; +var middleware; (function(Plugins) { require('./plugins/install')(Plugins); @@ -183,13 +183,17 @@ var fs = require('fs'), utils.walk(templatesPath, function(err, pluginTemplates) { if (pluginTemplates) { pluginTemplates.forEach(function(pluginTemplate) { - tplName = "/" + pluginTemplate.replace(templatesPath, '').substring(1); + if (pluginTemplate.endsWith('.tpl')) { + tplName = "/" + pluginTemplate.replace(templatesPath, '').substring(1); - if (templates.hasOwnProperty(tplName)) { - winston.verbose('[plugins] ' + tplName + ' replaced by ' + plugin.id); + if (templates.hasOwnProperty(tplName)) { + winston.verbose('[plugins] ' + tplName + ' replaced by ' + plugin.id); + } + + templates[tplName] = pluginTemplate; + } else { + winston.warn('[plugins] Skipping ' + pluginTemplate + ' by plugin ' + plugin.id); } - - templates[tplName] = pluginTemplate; }); } else { winston.warn('[plugins/' + plugin.id + '] A templates directory was defined for this plugin, but was not found.');