Browse Source

Clean up drupal_block()

merge-requests/4/head 8.x-2.2
Chi 6 years ago
parent
commit
019921476d
  1. 39
      src/TwigExtension.php

39
src/TwigExtension.php

@ -124,46 +124,29 @@ class TwigExtension extends \Twig_Extension {
$block_plugin->setTitle($title);
}
$content = $block_plugin->build();
if ($content && !Element::isEmpty($content)) {
if ($wrapper) {
$build = [
'#theme' => 'block',
'#attributes' => [],
'#contextual_links' => [],
'#configuration' => $block_plugin->getConfiguration(),
'#plugin_id' => $block_plugin->getPluginId(),
'#base_plugin_id' => $block_plugin->getBaseId(),
'#derivative_plugin_id' => $block_plugin->getDerivativeId(),
'content' => $content,
'content' => $block_plugin->build(),
'#cache' => [
'contexts' => $block_plugin->getCacheContexts(),
'tags' => $block_plugin->getCacheTags(),
'max-age' => $block_plugin->getCacheMaxAge(),
],
];
}
else {
$build = $content;
}
}
else {
// Preserve cache metadata of empty blocks.
$build = [
'#markup' => '',
'#cache' => isset($content['#cache']) ? $content['#cache'] : [],
];
}
if ($block_plugin instanceof TitleBlockPluginInterface) {
$build['#cache']['contexts'][] = 'url';
}
if (!empty($content)) {
CacheableMetadata::createFromRenderArray($build)
->merge(CacheableMetadata::createFromRenderArray($content))
->applyTo($build);
if ($wrapper) {
$build += [
'#theme' => 'block',
'#attributes' => [],
'#contextual_links' => [],
'#configuration' => $block_plugin->getConfiguration(),
'#plugin_id' => $block_plugin->getPluginId(),
'#base_plugin_id' => $block_plugin->getBaseId(),
'#derivative_plugin_id' => $block_plugin->getDerivativeId(),
];
}
return $build;

Loading…
Cancel
Save