- Removed the $help parameter from the _form hook. The help, typically

  submission guidelines, should be emmitted using the _help hook.

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/forum.module b/modules/forum.module
index 2e18afe04..d5aa94832 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -181,7 +181,7 @@ function forum_validate(&$node) {
   }
 }
 
-function forum_form(&$node, &$help, &$error) {
+function forum_form(&$node, &$error) {
   if ($node->tid) {
     // editing
     $tid = $node->tid;
@@ -191,9 +191,6 @@ function forum_form(&$node, &$help, &$error) {
     $tid = arg(3);
   }
 
-  // outputs the compose guidelines
-  $help = variable_get("forum_help", "");
-
   $output .= _taxonomy_term_select(t("Forum"), "tid", $tid, variable_get("forum_nav_vocabulary", ""), "", 0, "", variable_get("forum_containers", array()));
 
   if ($node->nid) {
@@ -693,6 +690,9 @@ function forum_help($section = "admin/help#forum") {
     case 'admin/system/modules/forum':
       $output = _forum_message_taxonomy();
       break;
+    case 'node/add/forum':
+      $output = variable_get('forum_help', '');
+      break;
   }
 
   return $output;