|
@@ -114,7 +114,7 @@ |
|
|
block discarded – undo |
|
114
|
114
|
$twigEnvironment->addFunction($function); |
|
115
|
115
|
|
|
116
|
116
|
$template = $twigEnvironment->loadTemplate($this->twigPath); |
|
117
|
|
- $context = $twigEnvironment->mergeGlobals($data); |
|
|
117
|
+ $context = $twigEnvironment->mergeGlobals($data); |
|
118
|
118
|
|
|
119
|
119
|
if (!$template->hasBlock('subject', $context) || (!$template->hasBlock('body_html', $context) && !$template->hasBlock('body_text', $context))) { |
|
120
|
120
|
throw MissingBlockException::missingBlock($template->getBlockNames()); |
Please login to merge, or discard this patch.