diff --git a/core/modules/block/lib/Drupal/block/Entity/Block.php b/core/modules/block/lib/Drupal/block/Entity/Block.php index 0298f44..7e5e090 100644 --- a/core/modules/block/lib/Drupal/block/Entity/Block.php +++ b/core/modules/block/lib/Drupal/block/Entity/Block.php @@ -121,8 +121,12 @@ public function getPlugin() { */ public function label($langcode = NULL) { $settings = $this->get('settings'); - $definition = $this->getPlugin()->getPluginDefinition(); - return $settings['label'] ?: $definition['admin_label']; + if ($settings['label']) { + return $settings['label']; + } + else { + return $this->getPlugin()->getPluginDefinition(); + } } /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php index b26faa5..dac57a0 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php @@ -55,7 +55,7 @@ public function defaultConfiguration() { $settings = parent::defaultConfiguration(); if ($this->displaySet) { - return $this->view->display_handler->blockSettings($settings); + $settings += $this->view->display_handler->blockSettings($settings); } return $settings;