summaryrefslogtreecommitdiff
path: root/modules/system/system.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-04-29 08:04:24 +0000
committerDries Buytaert <dries@buytaert.net>2009-04-29 08:04:24 +0000
commit94c3dceedae0123f7a1bd518d00aa2839ca82d14 (patch)
tree807ea8505fec1bce86ef7f4bc584e46e917ca456 /modules/system/system.module
parent1ed25923a356008fd0148de5d41ee3623d4c8f3e (diff)
downloadbrdo-94c3dceedae0123f7a1bd518d00aa2839ca82d14.tar.gz
brdo-94c3dceedae0123f7a1bd518d00aa2839ca82d14.tar.bz2
- Patch #240873 by Gábor Hojtsy: move custom help settings to blocks. Very exciting.
Diffstat (limited to 'modules/system/system.module')
-rw-r--r--modules/system/system.module12
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index 96897c6e2..bf10db57a 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -895,6 +895,10 @@ function system_block_list() {
// Not worth caching.
'cache' => BLOCK_NO_CACHE,
);
+ $blocks['help'] = array(
+ 'info' => t('System help'),
+ 'weight' => '5',
+ );
// System-defined menu blocks.
foreach (menu_list_system_menus() as $menu_name => $title) {
$blocks[$menu_name]['info'] = t($title);
@@ -960,6 +964,13 @@ function system_block_view($delta = '') {
$block['subject'] = NULL;
$block['content'] = theme('system_powered_by', $image_path);
return $block;
+ case 'help':
+ return array(
+ // Don't display a title.
+ 'subject' => NULL,
+ 'content' => menu_get_active_help(),
+ );
+ break;
default:
// All system menu blocks.
$system_menus = menu_list_system_menus();
@@ -1121,6 +1132,7 @@ function system_theme_default() {
'content' => 'Content',
'header' => 'Header',
'footer' => 'Footer',
+ 'help' => 'Help',
),
'description' => '',
'features' => array(