- Updated the story module to use the _validate hook.  Fixes bug #2919 reported
  by Jonathan.

modules/story.module

@@ -61,20 +61,21 @@ function story_link($type) {
   return $links;
 }
 
-function story_form(&$node, &$help, &$error) {
-
-  if (isset($node->body)) {
+function story_validate(&$node) {
 
   /*
   ** Validate the size of the story:
   */
 
-    if (count(explode(" ", $node->body)) < variable_get("minimum_story_size", 0)) {
+  if (isset($node->body) && count(explode(" ", $node->body)) < variable_get("minimum_story_size", 0)) {
+print "body : $node->body";
     $error["body"] = "<div class=\"error\">". t("The body of your story is too short.") ."</div>";
   }
 
+  return $error;
 }
-  else {
+
+function story_form(&$node, &$help, &$error) {
 
   /*
   ** Carry out some explanation or submission guidelines:
@@ -82,11 +83,10 @@ function story_form(&$node, &$help, &$error) {
 
   $help = variable_get("story_help", "");
 
-  }
-
   if (function_exists("taxonomy_node_form")) {
     $output .= implode("", taxonomy_node_form("story", $node));
   }
+
   $output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : form_allowed_tags_text());
 
   return $output;

modules/story/story.module

@@ -61,20 +61,21 @@ function story_link($type) {
   return $links;
 }
 
-function story_form(&$node, &$help, &$error) {
-
-  if (isset($node->body)) {
+function story_validate(&$node) {
 
   /*
   ** Validate the size of the story:
   */
 
-    if (count(explode(" ", $node->body)) < variable_get("minimum_story_size", 0)) {
+  if (isset($node->body) && count(explode(" ", $node->body)) < variable_get("minimum_story_size", 0)) {
+print "body : $node->body";
     $error["body"] = "<div class=\"error\">". t("The body of your story is too short.") ."</div>";
   }
 
+  return $error;
 }
-  else {
+
+function story_form(&$node, &$help, &$error) {
 
   /*
   ** Carry out some explanation or submission guidelines:
@@ -82,11 +83,10 @@ function story_form(&$node, &$help, &$error) {
 
   $help = variable_get("story_help", "");
 
-  }
-
   if (function_exists("taxonomy_node_form")) {
     $output .= implode("", taxonomy_node_form("story", $node));
   }
+
   $output .= form_textarea(t("Body"), "body", $node->body, 60, 15, $error["body"] ? $error["body"] : form_allowed_tags_text());
 
   return $output;