From 68a91f5e243ddfe0e5ae9d4080c64edbe2184289 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Tue, 10 Nov 2020 01:28:26 -0500
Subject: [PATCH] HTML export: Move `padId` to context object property

---
 doc/api/hooks_server-side.md | 14 +++++++-------
 src/node/utils/ExportHtml.js |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/api/hooks_server-side.md b/doc/api/hooks_server-side.md
index 33188fa9c..e1cfdfb79 100644
--- a/doc/api/hooks_server-side.md
+++ b/doc/api/hooks_server-side.md
@@ -661,22 +661,22 @@ function _analyzeLine(alineAttrs, apool) {
 }
 ```
 
-## exportHTMLAdditionalContent 
+## exportHTMLAdditionalContent
 Called from: src/node/utils/ExportHtml.js
 
 Things in context:
 
 1. padId
 
-This hook will allow a plug-in developer to include additional HTML content in the Body of the exported HTML
+This hook will allow a plug-in developer to include additional HTML content in
+the body of the exported HTML.
 
 Example:
-```
-exports.exportHTMLAdditionalContent = async (hookName, context) => {
-  let padId = context;
-  return "I am groot in " + padId;
-}
 
+```
+exports.exportHTMLAdditionalContent = async (hookName, {padId}) => {
+  return 'I am groot in ' + padId;
+};
 ```
 
 ## stylesForExport
diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js
index 665e3d7eb..d7946dc91 100644
--- a/src/node/utils/ExportHtml.js
+++ b/src/node/utils/ExportHtml.js
@@ -498,10 +498,9 @@ exports.getPadHTMLDocument = async function (padId, revNum)
 
   let html = await getPadHTML(pad, revNum);
 
-  let exportHTMLAdditionalContent = await hooks.aCallAll("exportHTMLAdditionalContent", padId);
-  exportHTMLAdditionalContent.forEach(function(hookHtml){
+  for (const hookHtml of await hooks.aCallAll("exportHTMLAdditionalContent", {padId}) {
     html += hookHtml;
-  });
+  }
 
   return eejs.require("ep_etherpad-lite/templates/export_html.html", {
     body: html,