- Moved most of the options in structure.module to node.module. The

  structure.module either needs work, or replacement by index.module:
  see "admin > node > node settings".

  It will do for now and it can always made better when we can think
  of a better solution; it is the best I could think of.   Now what?
  index.module or structure.module?  I'm currently pro index.module.

- Drastically simplified "variable.inc".

- Removed most dependecies on structure.module from all content related
  modules.  Thus making our modules more modular.  ;)

- Fixed calculation glitch in queue.module.

- Fixed potential function name clash/conflict in rating.module, and
  simplified some code on my way.

- Started removing all global variables $status and $rstatus.  Global
  variables are "yucky" so in near future, we will replace all global
  $status variables by a call to node_status().  Originally, $status
  was only introduced as a temporary hack and nothing is as permanent
  as a temporary hack so I took it out when still possible.

- Changed the watchdog messages a bit.

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/story/story.module b/modules/story/story.module
index 939edd94d..e6f48b5d3 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -72,7 +72,7 @@ function story_save($edit) {
   global $status, $user;
 
   if (!$edit[nid]) {
-    node_save($edit, array(abstract, author => $user->id, body, cid, comment => category_comment($edit[cid]), moderate => topic_moderate($edit[tid]), promote => category_promote($edit[cid]), score => 0, status => (category_submission($edit[cid]) ? $status[queued] : $status[posted]), tid, timestamp => time(), title, type => "story", votes => 0));
+    node_save($edit, array(abstract, author => $user->id, body, cid, comment => variable_get("story_comment", 0), moderate => variable_get("story_moderate", ""), promote => variable_get("story_promote", 0), score => 0, status => variable_get("story_status", $status[queued]), tid, timestamp => time(), title, type => "story", votes => 0));
   }
   else if (user_access($user)) {
     node_save($edit, array(abstract, body, cid, tid, title, type => "story"));