diff options
| author | David Rothstein <drothstein@gmail.com> | 2012-07-29 18:19:43 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2012-07-29 18:19:43 -0400 |
| commit | 6d1ce3866cdd543bf7ae9a33439d37a33492d248 (patch) | |
| tree | a5156b8e221b97b8e182d89325f134b7124ec04a | |
| parent | bada57662c3bf6f2aa1cb1cc899abc98506a4679 (diff) | |
| download | brdo-6d1ce3866cdd543bf7ae9a33439d37a33492d248.tar.gz brdo-6d1ce3866cdd543bf7ae9a33439d37a33492d248.tar.bz2 | |
Issue #1373312 by sun: Assign system_main() block to 'content' region and help block to 'help' region by default.
| -rw-r--r-- | CHANGELOG.txt | 6 | ||||
| -rw-r--r-- | modules/system/system.module | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8b9a908f7..1446cc0eb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -8,7 +8,7 @@ Drupal 7.15, xxxx-xx-xx (development version) http://drupal.org/node/1597378). - Fixed issue where field form structure was incomplete if field_access() returned FALSE. Instead of being incomplete, the form structure now has - #access set to FALSE and field form validation is skipped (array structure + #access set to FALSE and field form validation is skipped (data structure change). - Added EntityFieldQuery support for taxonomy bundles. - Introduced generic entity language support. Entities may now declare their @@ -37,6 +37,10 @@ Drupal 7.15, xxxx-xx-xx (development version) value led to an illegal choice error when none were selected. - Fixed regression: Non-node entities couldn't be accessed with EntityFieldQuery. +- Changed the System module's hook_block_info() implementation to assign the + "Main page content" and "System help" blocks to appropriate regions by + default and prevent error messages on the block administration page (data + structure change). Drupal 7.14 2012-05-02 ---------------------- diff --git a/modules/system/system.module b/modules/system/system.module index 48b2959c6..9897fb25e 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2023,6 +2023,10 @@ function system_block_info() { 'info' => t('Main page content'), // Cached elsewhere. 'cache' => DRUPAL_NO_CACHE, + // Auto-enable in 'content' region by default, which always exists. + // @see system_themes_page(), drupal_render_page() + 'status' => 1, + 'region' => 'content', ); $blocks['powered-by'] = array( 'info' => t('Powered by Drupal'), @@ -2033,6 +2037,9 @@ function system_block_info() { 'info' => t('System help'), 'weight' => '5', 'cache' => DRUPAL_NO_CACHE, + // Auto-enable in 'help' region by default, if the theme defines one. + 'status' => 1, + 'region' => 'help', ); // System-defined menu blocks. foreach (menu_list_system_menus() as $menu_name => $title) { |