diff -u b/core/modules/block/block.module b/core/modules/block/block.module --- b/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -34,7 +34,7 @@ $output .= '
' . t('Controlling visibility') . '
'; $output .= '
' . t('You can control the visibility of a block by restricting it to specific pages, content types, and/or roles by setting the appropriate options under Visibility settings of the block configuration.') . '
'; $output .= '
' . t('Adding custom blocks') . '
'; - $output .= '
' . t('You can add custom blocks, if the the Custom Block module is installed on the Extend page. For more information, see the Custom Block help page.', array('!extend' => \Drupal::url('system.modules_list'), '!blockcontent-help' => \Drupal::url('help.page', array('name' => 'block_content')))) . '
'; + $output .= '
' . t('You can add custom blocks, if the Custom Block module is installed on the Extend page. For more information, see the Custom Block help page.', array('!extend' => \Drupal::url('system.modules_list'), '!blockcontent-help' => \Drupal::url('help.page', array('name' => 'block_content')))) . '
'; $output .= ''; return $output; } @@ -108,9 +108,8 @@ // Disable blocks in invalid regions. if (!empty($region) && $region != BlockInterface::BLOCK_REGION_NONE && !isset($regions[$region]) && $status) { drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block_id, '%region' => $region)), 'warning'); - // Uninstalled modules are moved into the - // BlockInterface::BLOCK_REGION_NONE later so no need to move the block to - // another region. + // Disabled blocks are moved into the BlockInterface::BLOCK_REGION_NONE + // later so no need to move the block to another region. $block->disable()->save(); } // Set region to none if not enabled. diff -u b/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php --- b/core/modules/block/src/Tests/Views/DisplayBlockTest.php +++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php @@ -23,7 +23,7 @@ class DisplayBlockTest extends ViewTestBase { /** - * Modules to install. + * Modules to enable. * * @var array */ @@ -32,7 +32,7 @@ protected $strictConfigSchema = TRUE; /** - * Modules to enable. + * Modules to install. * * @var array */