diff options
| -rw-r--r-- | modules/book.module | 16 | ||||
| -rw-r--r-- | modules/book/book.module | 16 | ||||
| -rw-r--r-- | modules/node.module | 4 | ||||
| -rw-r--r-- | modules/node/node.module | 4 |
4 files changed, 22 insertions, 18 deletions
diff --git a/modules/book.module b/modules/book.module index be4c9f7b9..7f7d48409 100644 --- a/modules/book.module +++ b/modules/book.module @@ -63,7 +63,7 @@ function book_save($op, $node) { ** and are not promoted by derault. See also: book_load(). */ - return array("created" => time(), "moderate" => 1, "name" => $user->name, "parent", "promote" => 0, "score" => 0, "status" => 1, "uid" => $user->uid, "users" => "", "revisions", "votes" => 0, "weight"); + return array("created" => time(), "moderate" => 1, "parent", "promote" => 0, "score" => 0, "status" => 1, "users" => "", "revisions", "votes" => 0, "weight"); } else if (user_access("adminster nodes")) { /* @@ -105,8 +105,14 @@ function book_load($node) { ** book page through the admin pages. See also: book_save(). */ - $book->name = $user->name; - $book->uid = $user->uid; + if ($user->uid) { + $book->uid = $user->uid; + $book->name = $user->name; + } + else { + $book->uid = 0; + $book->name = ""; + } } /* @@ -156,10 +162,6 @@ function book_form($node, $help, $error) { */ $output .= form_hidden("revision", 1); - - $node->uid = $user->uid; // $node is passed by reference - $node->name = $user->name; - } return $output; diff --git a/modules/book/book.module b/modules/book/book.module index be4c9f7b9..7f7d48409 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -63,7 +63,7 @@ function book_save($op, $node) { ** and are not promoted by derault. See also: book_load(). */ - return array("created" => time(), "moderate" => 1, "name" => $user->name, "parent", "promote" => 0, "score" => 0, "status" => 1, "uid" => $user->uid, "users" => "", "revisions", "votes" => 0, "weight"); + return array("created" => time(), "moderate" => 1, "parent", "promote" => 0, "score" => 0, "status" => 1, "users" => "", "revisions", "votes" => 0, "weight"); } else if (user_access("adminster nodes")) { /* @@ -105,8 +105,14 @@ function book_load($node) { ** book page through the admin pages. See also: book_save(). */ - $book->name = $user->name; - $book->uid = $user->uid; + if ($user->uid) { + $book->uid = $user->uid; + $book->name = $user->name; + } + else { + $book->uid = 0; + $book->name = ""; + } } /* @@ -156,10 +162,6 @@ function book_form($node, $help, $error) { */ $output .= form_hidden("revision", 1); - - $node->uid = $user->uid; // $node is passed by reference - $node->name = $user->name; - } return $output; diff --git a/modules/node.module b/modules/node.module index e7d3ed1c1..704ca8928 100644 --- a/modules/node.module +++ b/modules/node.module @@ -790,7 +790,7 @@ function node_submit($node) { $fields = array("nid", "uid", "body", "comment", "created", "promote", "moderate", "revisions", "status", "teaser", "title", "type" => $node->type); } else { - $fields = array("nid", "uid" => $user->uid, "body", "teaser", "title", "type" => $node->type); + $fields = array("nid", "uid" => ($user->uid ? $user->uid : 0), "body", "teaser", "title", "type" => $node->type); } node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node))); @@ -822,7 +822,7 @@ function node_submit($node) { $fields = array("uid", "body", "comment" => 1, "promote", "moderate", "status" => 1, "teaser", "title", "type" => $node->type); } else { - $fields = array("uid" => $user->uid, "body", "comment" => 1, "teaser", "title", "type" => $node->type); + $fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 1, "teaser", "title", "type" => $node->type); } node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node))); diff --git a/modules/node/node.module b/modules/node/node.module index e7d3ed1c1..704ca8928 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -790,7 +790,7 @@ function node_submit($node) { $fields = array("nid", "uid", "body", "comment", "created", "promote", "moderate", "revisions", "status", "teaser", "title", "type" => $node->type); } else { - $fields = array("nid", "uid" => $user->uid, "body", "teaser", "title", "type" => $node->type); + $fields = array("nid", "uid" => ($user->uid ? $user->uid : 0), "body", "teaser", "title", "type" => $node->type); } node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node))); @@ -822,7 +822,7 @@ function node_submit($node) { $fields = array("uid", "body", "comment" => 1, "promote", "moderate", "status" => 1, "teaser", "title", "type" => $node->type); } else { - $fields = array("uid" => $user->uid, "body", "comment" => 1, "teaser", "title", "type" => $node->type); + $fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 1, "teaser", "title", "type" => $node->type); } node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node))); |