diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-28 23:36:13 -0700 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-28 23:36:13 -0700 |
commit | 9647c746ba5ef11003a6eee2aa7f58d40228a36a (patch) | |
tree | 0ca0eed2142240d7a7c63ee3deac545d0b658a6b /modules | |
parent | 30ea0c7f46023ec346cefb77216b5d7fad6a3617 (diff) | |
download | brdo-9647c746ba5ef11003a6eee2aa7f58d40228a36a.tar.gz brdo-9647c746ba5ef11003a6eee2aa7f58d40228a36a.tar.bz2 |
Issue #1172560 by bas.hr, bellesmanieres, NROTC_Webmaster, tim.plunkett: Fixed The block X was assigned to the invalid region Y and has been disabled.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/block/block.module | 4 | ||||
-rw-r--r-- | modules/block/block.test | 66 |
2 files changed, 68 insertions, 2 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index be5a196dd..70f55e5ab 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -432,10 +432,10 @@ function _block_rehash($theme = NULL) { if (!isset($block['weight'])) { $block['weight'] = 0; } - if (!empty($block['region']) && $block['region'] != BLOCK_REGION_NONE && !isset($regions[$block['region']])) { + if (!empty($block['region']) && $block['region'] != BLOCK_REGION_NONE && !isset($regions[$block['region']]) && $block['status'] == 1) { drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block['info'], '%region' => $block['region'])), 'warning'); // Disabled modules are moved into the BLOCK_REGION_NONE later so no - // need to move the bock to another region. + // need to move the block to another region. $block['status'] = 0; } // Set region to none if not enabled and make sure status is set. diff --git a/modules/block/block.test b/modules/block/block.test index 323034062..cdd0d4589 100644 --- a/modules/block/block.test +++ b/modules/block/block.test @@ -791,3 +791,69 @@ class BlockHiddenRegionTestCase extends DrupalWebTestCase { $this->assertText('Search form', t('Block was displayed on the front page.')); } } + +/** + * Tests that a block assigned to an invalid region triggers the warning. + */ +class BlockInvalidRegionTestCase extends DrupalWebTestCase { + public static function getInfo() { + return array( + 'name' => 'Blocks in invalid regions', + 'description' => 'Checks that an active block assigned to a non-existing region triggers the warning message and is disabled.', + 'group' => 'Block', + ); + } + + function setUp() { + parent::setUp(array('block', 'block_test')); + // Create an admin user. + $admin_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages')); + $this->drupalLogin($admin_user); + } + + /** + * Tests that blocks assigned to invalid regions work correctly. + */ + function testBlockInInvalidRegion() { + // Enable a test block in the default theme and place it in an invalid region. + db_merge('block') + ->key(array( + 'module' => 'block_test', + 'delta' => 'test_html_id', + 'theme' => variable_get('theme_default', 'stark'), + )) + ->fields(array( + 'status' => 1, + 'region' => 'invalid_region', + 'cache' => DRUPAL_NO_CACHE, + )) + ->execute(); + + $warning_message = t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => t('Test block html id'), '%region' => 'invalid_region')); + + // Clearing the cache should disable the test block placed in the invalid region. + $this->drupalPost('admin/config/development/performance', array(), 'Clear all caches'); + $this->assertRaw($warning_message, 'Enabled block was in the invalid region and has been disabled.'); + + // Clear the cache to check if the warning message is not triggered. + $this->drupalPost('admin/config/development/performance', array(), 'Clear all caches'); + $this->assertNoRaw($warning_message, 'Disabled block in the invalid region will not trigger the warning.'); + + // Place disabled test block in the invalid region of the default theme. + db_merge('block') + ->key(array( + 'module' => 'block_test', + 'delta' => 'test_html_id', + 'theme' => variable_get('theme_default', 'stark'), + )) + ->fields(array( + 'region' => 'invalid_region', + 'cache' => DRUPAL_NO_CACHE, + )) + ->execute(); + + // Clear the cache to check if the warning message is not triggered. + $this->drupalPost('admin/config/development/performance', array(), 'Clear all caches'); + $this->assertNoRaw($warning_message, 'Disabled block in the invalid region will not trigger the warning.'); + } +} |