diff --git a/core/modules/block/block.module b/core/modules/block/block.module index eeba0bb..5b30b4a 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -145,11 +145,7 @@ function block_rebuild() { foreach ($blocks as $block_id => $block) { // Disable blocks in invalid regions. if (!isset($regions[$block->getRegion()]) && $block->status()) { - // Do not display the invalid region message if the deprecated - // constant was used to disable the block. - if ($block->getRegion() !== BlockInterface::BLOCK_REGION_NONE) { - drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block_id, '%region' => $block->getRegion()]), 'warning'); - } + drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block_id, '%region' => $block->getRegion()]), 'warning'); $block ->setRegion(system_default_region($theme)) ->disable() diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php index 8a1bcd8..1a0c82c 100644 --- a/core/modules/block/src/Entity/Block.php +++ b/core/modules/block/src/Entity/Block.php @@ -35,7 +35,7 @@ * "delete-form" = "/admin/structure/block/manage/{block}/delete", * "edit-form" = "/admin/structure/block/manage/{block}", * "enable" = "/admin/structure/block/manage/{block}/enable", - * "disable" = "/admin/structure/block/manage/{block}/disable" + * "disable" = "/admin/structure/block/manage/{block}/disable", * }, * config_export = { * "id",