Merge branch 'MDL-59749-master' of git://github.com/ryanwyllie/moodle

moodle · Aug 8, 2017 · c036256 · c036256
2 parents ca84ba0 + 0a501e1
commit c036256
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
@@ -78,7 +78,6 @@ public function export_for_template(renderer_base $output) {
                 $otherattributes[] = $attr . '="' . s($value) . '"';
             }
         }
-        $context['name'] = $context['name'] ?: $this->getName();
         $context['extraclasses'] = $extraclasses;
         $context['type'] = $this->getType();
         $context['attributes'] = implode(' ', $otherattributes);

diff --git a/theme/boost/templates/core_form/element-template-inline.mustache b/theme/boost/templates/core_form/element-template-inline.mustache
@@ -4,7 +4,7 @@
         {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}
         {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
     </label>
-    <span id="{{element.id}}" data-fieldtype="{{element.type}}">
+    <span data-fieldtype="{{element.type}}">
         {{$ element }}
             <!-- Element goes here -->
         {{/ element }}