From 69bf32cd46717a15d3b6ff06bc95b86b42885825 Mon Sep 17 00:00:00 2001
From: ilmar <ilmar.tyrk@gmail.com>
Date: Thu, 19 Oct 2017 16:11:40 +0300
Subject: [PATCH] fix to https://github.com/ether/etherpad-lite/issues/2486

---
 src/node/utils/ExportHtml.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js
index bd177ac47..576d2b8fd 100644
--- a/src/node/utils/ExportHtml.js
+++ b/src/node/utils/ExportHtml.js
@@ -455,7 +455,11 @@ function getHTMLFromAtext(pad, atext, authorColors)
 
       if (lineContentFromHook)
       {
-        pieces.push(lineContentFromHook, '');
+        if (context.lineContent === lineContent && lineContentFromHook !== true) {
+          pieces.push(lineContentFromHook, '');   // Just to be compatible with plugins that are not updated to this solution
+        } else {
+          pieces.push(context.lineContent, ''); // should be used instead of lineContentFromHook because context is passed through each hook with all it's updated from each plugin
+        } 
       }
       else
       {