From e2aefa3ba8ba556581fd0662944c5547aae42789 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Tue, 7 Apr 2020 23:16:42 +1000
Subject: [PATCH] MDL-68353 core: do not output empty labels

---
 lib/form/templates/element-template.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/form/templates/element-template.mustache b/lib/form/templates/element-template.mustache
index bbf538dbe9a..d9528fabd0e 100644
--- a/lib/form/templates/element-template.mustache
+++ b/lib/form/templates/element-template.mustache
@@ -49,7 +49,7 @@
             {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
             {{{helpbutton}}}
         </span>
-        {{$ label }}
+        {{# label}}{{$ label }}
             {{^element.staticlabel}}
                 <label class="col-form-label d-inline {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
                     {{{label}}}
@@ -60,7 +60,7 @@
                     {{{label}}}
                 </span>
             {{/element.staticlabel}}
-        {{/ label }}
+        {{/ label }}{{/ label}}
     </div>
     <div class="col-md-9 form-inline felement" data-fieldtype="{{element.type}}">
         {{$ element }}