From ad785e699e8edb48db31a09caa7e919ac8c2a91c Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 31 Oct 2016 14:43:40 +0800
Subject: [PATCH] MDL-56631 passwordunmask: Admin setting for password unmask
 not working

Andrew refactored the way it rendered the element, but did not update all the
templates (there is mforms element AND admin settings element).

See 3778a9226f05a6c0203b291a95378dd8a56c6516 for Andrews original change.
---
 .../setting_configpasswordunmask.mustache     | 25 ++++++++++-------
 .../setting_configpasswordunmask.mustache     | 28 +++++++++++--------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/admin/templates/setting_configpasswordunmask.mustache b/admin/templates/setting_configpasswordunmask.mustache
index bf00ea7bcc2..cf7565c1932 100644
--- a/admin/templates/setting_configpasswordunmask.mustache
+++ b/admin/templates/setting_configpasswordunmask.mustache
@@ -35,18 +35,14 @@
 }}
 <div class="form-password">
     <span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
-        <noscript>
-            <!-- Backwards compatability for Behat -->
-            <input  type="password"
-                    name="{{ name }}"
-                    id="{{ id }}"
-                    value="{{ value }}"
-                    size="{{ size }}"
-                    >
-        </noscript>
         <span class="visibleifjs">
             <span data-passwordunmask="editor">
-                <!-- The input in the noscript will be moved here as part of the page load -->
+                <input  type="hidden"
+                        name="{{ name }}"
+                        id="{{ id }}"
+                        value="{{ value }}"
+                        size="{{ size }}"
+                        >
             </span>
             <a href="#" data-passwordunmask="edit" title="{{ edithint }}">
                 <span data-passwordunmask="displayvalue">{{> core_form/element-passwordunmask-fill }}</span>
@@ -59,6 +55,15 @@
                 {{# str }} passwordunmaskinstructions, form {{/ str }}
             </span>
         </span>
+        <noscript>
+            <!-- Backwards compatability for Behat -->
+            <input  type="password"
+                    name="{{ name }}"
+                    id="{{ id }}"
+                    value="{{ value }}"
+                    size="{{ size }}"
+                    >
+        </noscript>
     </span>
 </div>
 {{#js}}
diff --git a/theme/boost/templates/core_admin/setting_configpasswordunmask.mustache b/theme/boost/templates/core_admin/setting_configpasswordunmask.mustache
index d5325540c22..257e81ff20c 100644
--- a/theme/boost/templates/core_admin/setting_configpasswordunmask.mustache
+++ b/theme/boost/templates/core_admin/setting_configpasswordunmask.mustache
@@ -35,19 +35,15 @@
 }}
 <div class="form-password">
     <span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
-        <noscript>
-            <!-- Backwards compatability for Behat -->
-            <input  type="password"
-                    name="{{ name }}"
-                    id="{{ id }}"
-                    value="{{ value }}"
-                    size="{{ size }}"
-                    class="form-control d-inline-block"
-                    >
-        </noscript>
         <span class="visibleifjs">
             <span data-passwordunmask="editor">
-                <!-- The input in the noscript will be moved here as part of the page load -->
+                <input  type="hidden"
+                        name="{{ name }}"
+                        id="{{ id }}"
+                        value="{{ value }}"
+                        size="{{ size }}"
+                        class="form-control d-inline-block"
+                        >
             </span>
             <a href="#" data-passwordunmask="edit" title="{{ edithint }}">
                 <span data-passwordunmask="displayvalue">{{> core_form/element-passwordunmask-fill }}</span>
@@ -60,6 +56,16 @@
                 {{# str }} passwordunmaskinstructions, form {{/ str }}
             </span>
         </span>
+        <noscript>
+            <!-- Backwards compatability for Behat -->
+            <input  type="password"
+                    name="{{ name }}"
+                    id="{{ id }}"
+                    value="{{ value }}"
+                    size="{{ size }}"
+                    class="form-control d-inline-block"
+                    >
+        </noscript>
     </span>
 </div>
 {{#js}}