From 8f47a0c653ca22577aac7d933d22a1d647294b9c Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 14 Jan 2016 15:12:50 -0500
Subject: [PATCH] Fixed issue where themes without `templates` defined in
 `plugin.json` did not have their templates added upon startup (backwards
 compatibility re-established now)

Thanks @pichalite, for the debug!
---
 src/plugins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins.js b/src/plugins.js
index f7ef80c984..fcc2a11576 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -153,8 +153,8 @@ var fs = require('fs'),
 
 		Plugins.showInstalled(function(err, plugins) {
 			async.each(plugins, function(plugin, next) {
-				if (plugin.templates && plugin.id && plugin.active) {
-					var templatesPath = path.join(__dirname, '../node_modules', plugin.id, plugin.templates);
+				if (plugin.id && plugin.active && (plugin.templates || plugin.id.startsWith('nodebb-theme-'))) {
+					var templatesPath = path.join(__dirname, '../node_modules', plugin.id, plugin.templates || 'templates');
 					utils.walk(templatesPath, function(err, pluginTemplates) {
 						if (pluginTemplates) {
 							pluginTemplates.forEach(function(pluginTemplate) {