diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php index b472b8f..a41fd42 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php @@ -298,7 +298,7 @@ public function save(EntityInterface $entity) { $id = $entity->getOriginalID(); } $config = config($prefix . $id); - $is_new = $config->isNew(); + $is_new = $entity->isNew(); if ($id !== $entity->id()) { // Renaming a config object needs to cater for: diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php index ad1229a..5079ad8 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php @@ -142,8 +142,7 @@ protected function renderTests() { $expected = array(); $expected[] = '
'; $expected[] = ''; - $expected[] = '

Test block html id

'; - $expected[] = ' '; + $expected[] = ' '; $expected[] = '
'; $expected[] = '
'; $expected[] = '
'; diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 54eaf18..632d270 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -477,8 +477,7 @@ function overlay_block_access($block) { // reason for duplicating effort here is performance; we do not even want // these blocks to be built if they are not going to be displayed. if ($regions_to_render = overlay_get_regions_to_render()) { - $config = $block->getConfig(); - if (!in_array($config['region'], $regions_to_render)) { + if (!in_array($block->get('region'), $regions_to_render)) { return FALSE; } }