diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-09-25 23:48:24 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-09-25 23:48:24 +0000 |
| commit | 9e63842460c47d67400b5fe110ce3c76844cc9f2 (patch) | |
| tree | 7fed91d59ad92f56a5b07a19b903d3f67f48d27f /modules/system/system.module | |
| parent | 142003cd01034927b70d5237a9742309ed9b939d (diff) | |
| download | brdo-9e63842460c47d67400b5fe110ce3c76844cc9f2.tar.gz brdo-9e63842460c47d67400b5fe110ce3c76844cc9f2.tar.bz2 | |
- Patch #578676 by sun: clean ups for cron queue.
Diffstat (limited to 'modules/system/system.module')
| -rw-r--r-- | modules/system/system.module | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index fa308f81b..b8ff23d77 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1895,7 +1895,7 @@ function _system_get_module_data() { // Invoke hook_system_info_alter() to give installed modules a chance to // modify the data in the .info files if necessary. - drupal_alter('system_info', $modules[$key]->info, $modules[$key]); + drupal_alter('system_info', $modules[$key]->info, $modules[$key], 'module'); } // The install profile is required. @@ -1988,7 +1988,7 @@ function _system_get_theme_data() { // Invoke hook_system_info_alter() to give installed modules a chance to // modify the data in the .info files if necessary. - drupal_alter('system_info', $themes[$key]->info, $themes[$key]); + drupal_alter('system_info', $themes[$key]->info, $themes[$key], 'theme'); if (!empty($themes[$key]->info['base theme'])) { $sub_themes[] = $key; @@ -2150,11 +2150,13 @@ function system_region_list($theme_key, $show = REGIONS_ALL) { /** * Implement hook_system_info_alter(). */ -function system_system_info_alter(&$info, $file) { +function system_system_info_alter(&$info, $file, $type) { // Remove page-top from the blocks UI since it is reserved for modules to // populate from outside the blocks system. - $info['regions_hidden'][] = 'page_top'; - $info['regions_hidden'][] = 'page_bottom'; + if ($type == 'theme') { + $info['regions_hidden'][] = 'page_top'; + $info['regions_hidden'][] = 'page_bottom'; + } } /** |