From 36f90f3ef0c3edd8bb144d1688e1eaa4d39b2b56 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Mon, 23 Sep 2019 12:14:11 +0100
Subject: [PATCH] MDL-66750 formslib selects: handle size attribute properly

---
 lib/form/templates/element-select-inline.mustache       | 3 ++-
 lib/form/templates/element-select.mustache              | 3 ++-
 lib/form/templates/element-selectgroups-inline.mustache | 1 +
 lib/form/templates/element-selectgroups.mustache        | 1 +
 lib/form/templates/element-selectwithlink.mustache      | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/form/templates/element-select-inline.mustache b/lib/form/templates/element-select-inline.mustache
index 1dcb34fd0dd..1400b4ce14f 100644
--- a/lib/form/templates/element-select-inline.mustache
+++ b/lib/form/templates/element-select-inline.mustache
@@ -9,7 +9,8 @@
                    {{#error}}is-invalid{{/error}}"
         name="{{element.name}}"
         id="{{element.id}}"
-        {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
+        {{#element.multiple}}multiple{{/element.multiple}}
+        {{#element.size}}size="{{element.size}}"{{/element.size}}
         {{#error}}
             autofocus aria-describedby="{{element.iderror}}"
         {{/error}}
diff --git a/lib/form/templates/element-select.mustache b/lib/form/templates/element-select.mustache
index f701053acab..1d320b30247 100644
--- a/lib/form/templates/element-select.mustache
+++ b/lib/form/templates/element-select.mustache
@@ -102,7 +102,8 @@
                        {{#error}}is-invalid{{/error}}"
             name="{{element.name}}"
             id="{{element.id}}"
-            {{#element.multiple}}multiple size="{{element.size}}"{{/element.multiple}}
+            {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
diff --git a/lib/form/templates/element-selectgroups-inline.mustache b/lib/form/templates/element-selectgroups-inline.mustache
index 0164335aafe..84b449dcbea 100644
--- a/lib/form/templates/element-selectgroups-inline.mustache
+++ b/lib/form/templates/element-selectgroups-inline.mustache
@@ -4,6 +4,7 @@
     <select class="form-control custom-select {{#error}}is-invalid{{/error}}" name="{{element.name}}"
         id="{{element.id}}"
         {{#element.multiple}}multiple{{/element.multiple}}
+        {{#element.size}}size="{{element.size}}"{{/element.size}}
         {{#error}}
             autofocus aria-describedby="{{element.iderror}}"
         {{/error}}
diff --git a/lib/form/templates/element-selectgroups.mustache b/lib/form/templates/element-selectgroups.mustache
index 15738f722b8..987e9962377 100644
--- a/lib/form/templates/element-selectgroups.mustache
+++ b/lib/form/templates/element-selectgroups.mustache
@@ -4,6 +4,7 @@
         <select class="form-control custom-select {{#error}}is-invalid{{/error}}" name="{{element.name}}"
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
diff --git a/lib/form/templates/element-selectwithlink.mustache b/lib/form/templates/element-selectwithlink.mustache
index b49e0a5154b..28c58745ad8 100644
--- a/lib/form/templates/element-selectwithlink.mustache
+++ b/lib/form/templates/element-selectwithlink.mustache
@@ -4,6 +4,7 @@
         <select class="custom-select {{#error}}is-invalid{{/error}}" name="{{element.name}}"
             id="{{element.id}}"
             {{#element.multiple}}multiple{{/element.multiple}}
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}