Merge branch 'MDL-67544-master' of git://github.com/andrewnicols/moodle

carlooos28 · Jan 9, 2020 · 16f2eae · 16f2eae
2 parents 217a9b1 + 3b1c8df
commit 16f2eae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 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
@@ -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

diff --git a/mod/forum/templates/inpage_reply.mustache b/mod/forum/templates/inpage_reply.mustache
@@ -55,8 +55,8 @@
                 </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"/>
-                    <label class="form-check-label" for="private-reply">{{#str}} privatereply, forum {{/str}}</label>
+                    <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-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">
@@ -65,4 +65,4 @@
             </div>
         </form>
     </div>
-</div>
+</div>