Merge pull request #6850 from GawainLynch/hotfix/i

[3.3] Hack around macro abuse
bolt · Jul 24, 2017 · b24dc73 · b24dc73
2 parents 6cd00e8 + f777481
commit b24dc73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/view/twig/_base/_fieldset.twig b/app/view/twig/_base/_fieldset.twig
@@ -23,15 +23,15 @@
     for:    block('fieldset_label_for') ?? '',
 } %}
 
-{% if block('fieldset_label_info') is defined %}
+{% if block('fieldset_label_info') is defined and block('fieldset_label_text') is defined and block('fieldset_label_info') is not empty %}
     {% set field_info = buic_info(block('fieldset_label_text'), block('fieldset_label_info')) %}
 {% endif %}
 
 {#=== OUTPUT =========================================================================================================#}
 
 <fieldset{{ macro.attr(attributes_fieldset) }}>
     <legend class="sr-only">{% block fieldset_label_text %}{% endblock fieldset_label_text %}</legend>
-    {% if block('fieldset_label_text') is not empty %}
+    {% if block('fieldset_label_text') is defined and block('fieldset_label_text') is not empty %}
         <label{{ macro.attr(attributes_label) }}>{{ block('fieldset_label_text') }}: {{ field_info|default('') }}</label>
     {% endif %}
     {% block fieldset_controls %}{% endblock fieldset_controls %}