From 65dd79c84ed3ef85abc830e5d5fbb9c972cc94f0 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Sat, 10 May 2014 23:43:15 -0400
Subject: [PATCH] socket logic for #1149 -- handling of help tab in ACP

---
 public/src/modules/composer.js |  2 +-
 src/socket.io/modules.js       | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 7b3e0299fa..ebe720c44c 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -819,7 +819,7 @@ define(['taskbar'], function(taskbar) {
 				});
 
 				socket.emit('modules.composer.renderHelp', function(err, html) {
-					if (html && html.length > 0) {
+					if (!err && html && html.length > 0) {
 						postContainer.find('.help').html(html);
 						postContainer.find('[data-pane=".tab-help"]').parent().removeClass('hidden');
 					}
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index be71fb3c2b..74b5a4c280 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -100,7 +100,19 @@ SocketModules.composer.renderPreview = function(socket, content, callback) {
 };
 
 SocketModules.composer.renderHelp = function(socket, data, callback) {
-	plugins.fireHook('filter:composer.help', '', callback);
+	var helpText = meta.config['composer:customHelpText'] || '';
+
+	if (meta.config['composer:showHelpTab'] === '0') {
+		return callback(new Error('help-hidden'));
+	}
+
+	plugins.fireHook('filter:post.parse', helpText, function(err, helpText) {
+		if (!meta.config['composer:allowPluginHelp'] || meta.config['composer:allowPluginHelp'] === '1') {
+			plugins.fireHook('filter:composer.help', helpText, callback);
+		} else {
+			callback(null, helpText);
+		}
+	});
 };
 
 SocketModules.composer.register = function(socket, data) {