Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.437 diff -u -F^f -r1.437 common.inc --- includes/common.inc 11 Apr 2005 22:48:27 -0000 1.437 +++ includes/common.inc 28 Apr 2005 15:48:40 -0000 @@ -39,6 +39,16 @@ function drupal_get_breadcrumb() { } /** + * Get the helptext for the current page. + */ +function drupal_get_help() { + if ($help = menu_get_active_help()) { + return $help; + } +} + + +/** * Add output to the head tag of the HTML page. * This function can be called as long the headers aren't sent. */ Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.230 diff -u -F^f -r1.230 theme.inc --- includes/theme.inc 24 Apr 2005 16:22:30 -0000 1.230 +++ includes/theme.inc 28 Apr 2005 15:48:41 -0000 @@ -26,20 +26,6 @@ */ /** - * Hook Help - returns theme specific help and information. - * - * @param section defines the @a section of the help to be returned. - * - * @return a string containing the help output. - */ -function theme_help($section) { - switch ($section) { - case 'admin/themes#description': - return t('The base theme'); - } -} - -/** * Initialize the theme system by loading the theme. * * @return @@ -395,9 +381,7 @@ function theme_page($content) { $output .= $tabs; } - if ($help = menu_get_active_help()) { - $output .= ''. $help .'
'; - } + $output .= theme('help', drupal_get_help()); $output .= theme_status_messages(); @@ -489,6 +473,17 @@ function theme_breadcrumb($breadcrumb) { } /** + * Return a themed help message. + * + * @param $help + * The helptext for the current page. + * @return a string containing the helptext for the current page. + */ +function theme_help($help) { + return '
'. $help .'
'; +} + +/** * Return a themed node. * * @param $node