Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.799 diff -u -F^f -p -r1.799 common.inc --- includes/common.inc 20 Sep 2008 20:22:23 -0000 1.799 +++ includes/common.inc 23 Sep 2008 21:13:26 -0000 @@ -3293,8 +3293,6 @@ function drupal_write_record($table, &$o // Track serial fields so we can helpfully populate them after the query. if ($info['type'] == 'serial') { $serials[] = $field; - // Ignore values for serials when inserting data. Unsupported. - unset($object->$field); } // Build arrays for the fields, placeholders, and values in our query. Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.977 diff -u -F^f -p -r1.977 node.module --- modules/node/node.module 17 Sep 2008 20:37:32 -0000 1.977 +++ modules/node/node.module 23 Sep 2008 21:13:26 -0000 @@ -887,20 +887,23 @@ function node_submit($node) { } /** - * Save a node object into the database. + * Save changes to a node or add a new node. + * + * @param $node + * The $node object to be saved. If $node->nid is + * omitted, a new node will be added (unless $node->is_new is FALSE). */ function node_save(&$node) { // Let modules modify the node before it is saved to the database. node_invoke_nodeapi($node, 'presave'); global $user; - $node->is_new = FALSE; + if (!isset($node->is_new)) { + $node->is_new = empty($node->nid); + } // Apply filters to some default node fields: - if (empty($node->nid)) { - // Insert a new node. - $node->is_new = TRUE; - + if ($node->is_new) { // When inserting a node, $node->log must be set because // {node_revisions}.log does not (and cannot) have a default // value. If the user does not have permission to create @@ -922,6 +925,7 @@ function node_save(&$node) { } elseif (!empty($node->revision)) { $node->old_vid = $node->vid; + unset($node->vid); } else { // When updating a node, avoid clobberring an existing log entry with an empty one. @@ -967,9 +971,12 @@ function node_save(&$node) { // node_invoke($node, 'update'). node_invoke($node, $op); node_invoke_nodeapi($node, $op); - + // Update the node access table for this node. node_access_acquire_grants($node); + + // Clear internal properties. + unset($node->is_new); // Clear the page and block caches. cache_clear_all(); @@ -978,7 +985,7 @@ function node_save(&$node) { /** * Helper function to save a revision with the uid of the current user. * - * Node is taken by reference, becuse drupal_write_record() updates the + * Node is taken by reference, because drupal_write_record() updates the * $node with the revision id, and we need to pass that back to the caller. */ function _node_save_revision(&$node, $uid, $update = NULL) { Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.924 diff -u -F^f -p -r1.924 user.module --- modules/user/user.module 21 Sep 2008 15:08:39 -0000 1.924 +++ modules/user/user.module 23 Sep 2008 21:13:27 -0000 @@ -201,7 +201,7 @@ function user_load($array = array()) { * * @param $account * The $user object for the user to modify or add. If $user->uid is - * omitted, a new user will be added. + * omitted (or $user->is_new == TRUE), a new user will be added. * * @param $edit * An array of fields and values to save. For example array('name' @@ -234,7 +234,10 @@ function user_save($account, $edit = arr unset($edit['pass']); } - if (is_object($account) && $account->uid) { + if (!isset($account->is_new)) { + $account->is_new = empty($account->uid); + } + if (is_object($account) && !$account->is_new) { user_module_invoke('update', $edit, $account, $category); $data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid))); // Consider users edited by an administrator as logged in, if they haven't @@ -245,7 +248,7 @@ function user_save($account, $edit = arr foreach ($edit as $key => $value) { // Fields that don't pertain to the users or user_roles // automatically serialized into the users.data column. - if ($key != 'roles' && empty($user_fields[$key])) { + if (!in_array($key, array('roles', 'is_new')) && empty($user_fields[$key])) { if ($value === NULL) { unset($data[$key]); } @@ -326,7 +329,7 @@ function user_save($account, $edit = arr // fields from being saved there. $data = array(); foreach ($edit as $key => $value) { - if (($key != 'roles') && (empty($user_fields[$key])) && ($value !== NULL)) { + if (!in_array($key, array('roles', 'is_new')) && empty($user_fields[$key]) && $value !== NULL) { $data[$key] = $value; } }