diff --git a/Mime/NotificationEmail.php b/Mime/NotificationEmail.php index cc3e54de..6e33d33d 100644 --- a/Mime/NotificationEmail.php +++ b/Mime/NotificationEmail.php @@ -174,6 +174,26 @@ public function getHtmlTemplate(): ?string return '@email/'.$this->theme.'/notification/body.html.twig'; } + /** + * @return $this + */ + public function context(array $context): static + { + $parentContext = []; + + foreach ($context as $key => $value) { + if (\array_key_exists($key, $this->context)) { + $this->context[$key] = $value; + } else { + $parentContext[$key] = $value; + } + } + + parent::context($parentContext); + + return $this; + } + public function getContext(): array { return array_merge($this->context, parent::getContext()); diff --git a/Resources/views/Form/form_div_layout.html.twig b/Resources/views/Form/form_div_layout.html.twig index 29cfc2dc..02628b5a 100644 --- a/Resources/views/Form/form_div_layout.html.twig +++ b/Resources/views/Form/form_div_layout.html.twig @@ -14,7 +14,7 @@ {# Attribute "required" is not supported #} {%- set required = false -%} {%- endif -%} - + {%- endblock form_widget_simple -%} {%- block form_widget_compound -%} @@ -91,11 +91,11 @@ {%- endblock choice_widget_options -%} {%- block checkbox_widget -%} - + {%- endblock checkbox_widget -%} {%- block radio_widget -%} - + {%- endblock radio_widget -%} {%- block datetime_widget -%} @@ -402,7 +402,7 @@ {%- endif -%}