.../lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php | 3 ++- .../block/lib/Drupal/block/Tests/BlockStorageUnitTest.php | 6 +++--- .../views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php index fe7f461..dca5a43 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php @@ -89,7 +89,8 @@ public static function create(ContainerInterface $container, array $configuratio * {@inheritdoc} */ public function defaultConfiguration() { - return array( + $default_configuration = parent::defaultConfiguration(); + return $default_configuration + array( 'status' => TRUE, 'info' => '', 'view_mode' => 'full', diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php index 9c9ff2a..c6bee1f 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php @@ -99,12 +99,12 @@ protected function createTests() { 'region' => '-1', 'plugin' => 'test_html', 'settings' => array( - 'label' => '', - 'module' => 'block_test', - 'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE, 'cache' => array( 'max_age' => 0, ), + 'label' => '', + 'module' => 'block_test', + 'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE, ), 'visibility' => NULL, ); diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php index 56f3c86..32088c4 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php @@ -99,10 +99,8 @@ public function access(AccountInterface $account) { * {@inheritdoc} */ public function defaultConfiguration() { - $settings = array(); - $settings['views_label'] = ''; - - return $settings; + $default_configuration = parent::defaultConfiguration(); + return $default_configuration + array('views_label' => ''); } /**