diff --git a/core/modules/block/block.module b/core/modules/block/block.module index e9d9333..339d163 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -274,12 +274,6 @@ function template_preprocess_block(&$variables) { $variables['label'] = $variables['elements']['content']['#title']; } - $variables['attributes']['class'][] = 'block'; - $variables['attributes']['class'][] = drupal_html_class('block-' . $variables['configuration']['provider']); - - // Add default class for block content. - $variables['content_attributes']['class'][] = 'content'; - // Create a valid HTML ID and make sure it is unique. if (!empty($variables['elements']['#id'])) { $variables['attributes']['id'] = drupal_html_id('block-' . $variables['elements']['#id']); diff --git a/core/modules/block/src/Tests/BlockPreprocessUnitTest.php b/core/modules/block/src/Tests/BlockPreprocessUnitTest.php index 9118e21..5ae036a 100644 --- a/core/modules/block/src/Tests/BlockPreprocessUnitTest.php +++ b/core/modules/block/src/Tests/BlockPreprocessUnitTest.php @@ -50,7 +50,7 @@ function testBlockClasses() { // Test adding a class to the block content. $variables['content_attributes']['class'][] = 'test-class'; template_preprocess_block($variables); - $this->assertEqual($variables['content_attributes']['class'], array('test-class', 'content'), 'Default .content class added to block content_attributes'); + $this->assertEqual($variables['content_attributes']['class'], array('test-class'), 'Test-class class added to block content_attributes'); } } diff --git a/core/modules/block/src/Tests/BlockViewBuilderTest.php b/core/modules/block/src/Tests/BlockViewBuilderTest.php index 6aa0f8b..8c9fb13 100644 --- a/core/modules/block/src/Tests/BlockViewBuilderTest.php +++ b/core/modules/block/src/Tests/BlockViewBuilderTest.php @@ -83,7 +83,7 @@ public function testBasicRendering() { $entity = Block::load('test_block1'); $output = entity_view($entity, 'block'); $expected = array(); - $expected[] = '