From d0c026b563c7fa2553b0d5ef5f0cc3b53d374f94 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 8 Jan 2020 15:26:03 +0800
Subject: [PATCH 1/3] MDL-67544 mod_forum: Ensure that private reply checkbox
 has unique id

---
 mod/forum/templates/inpage_reply.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/forum/templates/inpage_reply.mustache b/mod/forum/templates/inpage_reply.mustache
index de8970c382a..de616588fb0 100644
--- a/mod/forum/templates/inpage_reply.mustache
+++ b/mod/forum/templates/inpage_reply.mustache
@@ -55,7 +55,7 @@
                 </button>
                 {{#canreplyprivately}}
                 <div class="form-check form-check-inline">
-                    <input type="checkbox" class="form-check-input" id="private-reply" title="{{#str}} privatereply, forum {{/str}}" name="privatereply"/>
+                    <input type="checkbox" class="form-check-input" id="private-reply-checkbox-{{uniqid}}" title="{{#str}} privatereply, forum {{/str}}" name="privatereply"/>
                     <label class="form-check-label" for="private-reply">{{#str}} privatereply, forum {{/str}}</label>
                 </div>
                 {{/canreplyprivately}}
@@ -65,4 +65,4 @@
             </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>

From 350edf7567f1af2a44cca0b44a1005db6f629b6c Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 9 Jan 2020 14:08:12 +0800
Subject: [PATCH 2/3] MDL-67544 mod_forum: Ensure post actions menu id is
 unique

---
 .../templates/forum_discussion_nested_v2_first_post.mustache  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
index 6d0a27fa7d5..32b44d0905a 100644
--- a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
+++ b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
@@ -142,7 +142,7 @@
                                         <button
                                             class="btn btn-icon text-muted icon-no-margin icon-size-3"
                                             type="button"
-                                            id="post-actions-menu-{{uniqid}}"
+                                            id="post-actions-menu-{{id}}-{{uniqid}}"
                                             data-toggle="dropdown"
                                             aria-haspopup="true"
                                             aria-expanded="false"
@@ -151,7 +151,7 @@
                                             {{#pix}} i/moremenu {{/pix}}
                                         </button>
                                         <!-- inline style to fix RTL placement bug -->
-                                        <div class="dropdown-menu dropdown-menu-right rounded-lg shadow border-0" aria-labelledby="post-actions-menu-{{uniqid}}" style="right: auto" role="menubar">
+                                        <div class="dropdown-menu dropdown-menu-right rounded-lg shadow border-0" aria-labelledby="post-actions-menu-{{id}}-{{uniqid}}" style="right: auto" role="menubar">
                                             {{#capabilities}}
                                                 {{#view}}
                                                     <a

From 3b1c8dfd67a53797eb999f4e9dbabfac0c5104ea Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 9 Jan 2020 14:55:52 +0800
Subject: [PATCH 3/3] MDL-67544f= mod_forum: Correct "for" attribute on private
 checkbox

---
 mod/forum/templates/inpage_reply.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/forum/templates/inpage_reply.mustache b/mod/forum/templates/inpage_reply.mustache
index de616588fb0..ddcb978b82e 100644
--- a/mod/forum/templates/inpage_reply.mustache
+++ b/mod/forum/templates/inpage_reply.mustache
@@ -56,7 +56,7 @@
                 {{#canreplyprivately}}
                 <div class="form-check form-check-inline">
                     <input type="checkbox" class="form-check-input" id="private-reply-checkbox-{{uniqid}}" title="{{#str}} privatereply, forum {{/str}}" name="privatereply"/>
-                    <label class="form-check-label" for="private-reply">{{#str}} privatereply, forum {{/str}}</label>
+                    <label class="form-check-label" for="private-reply-checkbox-{{uniqid}}">{{#str}} privatereply, forum {{/str}}</label>
                 </div>
                 {{/canreplyprivately}}
                 <button title="{{#str}} advanced, core {{/str}}" data-action="forum-advanced-reply" class="btn btn-link float-right" type="submit">