From 519d839e863bb585b1bb38bf10649507950ac863 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 16 Mar 2021 16:15:40 +0000
Subject: [PATCH] lists: bugfix: only show bullet list item on correct item

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

diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js
index 38e5fb1a6..d4cf7925c 100644
--- a/src/node/utils/ExportHtml.js
+++ b/src/node/utils/ExportHtml.js
@@ -311,6 +311,11 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
       if (i < textLines.length) {
         nextLine = _analyzeLine(textLines[i + 1], attribLines[i + 1], apool);
       }
+      // lineBulletLevel is used to ensure that the bullet is only drawn on
+      // the <ul> item that needs to display a bullet, this is to stop multiple
+      // bullets being drawn in an indented list.
+      // https://github.com/ether/etherpad-lite/issues/4426 for details.
+      let lineBulletLevel = 1;
       await hooks.aCallAll('getLineHTMLForExport', context);
       // To create list parent elements
       if ((!prevLine || prevLine.listLevel !== line.listLevel) ||
@@ -386,7 +391,13 @@ const getHTMLFromAtext = async (pad, atext, authorColors) => {
                 pieces.push(`<ol class="${line.listTypeName}">`);
               }
             } else {
-              pieces.push(`<ul class="${line.listTypeName}">`);
+              // listLevel is when we want to include bullet
+              if (lineBulletLevel === line.listLevel) {
+                pieces.push(`<ul class="${line.listTypeName}">`);
+              } else {
+                pieces.push('<ul class="indent">');
+                lineBulletLevel++;
+              }
             }
           }
         }