Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.807
diff -u -p -r1.807 common.inc
--- includes/common.inc	12 Oct 2008 06:27:03 -0000	1.807
+++ includes/common.inc	12 Oct 2008 11:18:35 -0000
@@ -3316,8 +3316,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.986
diff -u -p -r1.986 node.module
--- modules/node/node.module	12 Oct 2008 06:27:04 -0000	1.986
+++ modules/node/node.module	12 Oct 2008 11:18:39 -0000
@@ -896,20 +896,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 (or $node->is_new is TRUE) a new node will be added.
  */
 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
@@ -931,6 +934,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.
@@ -975,9 +979,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();
@@ -986,7 +993,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/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.7
diff -u -p -r1.7 node.test
--- modules/node/node.test	11 Oct 2008 18:29:20 -0000	1.7
+++ modules/node/node.test	12 Oct 2008 11:18:40 -0000
@@ -460,3 +460,60 @@ class NodeTitleXSSTestCase extends Drupa
     $this->assertNoRaw($xss, t('Harmful tags are escaped when editing a node.'));
   }
 }
+
+/**
+ * Test case to check node save related functionality, including import-save
+ */
+class NodeSaveTestCase extends DrupalWebTestCase {
+  /**
+   * Implementation of getInfo().
+   */
+  function getInfo() {
+    return array(
+      'name' => t('Node save test'),
+      'description' => t('Test node_save() for saving content.'),
+      'group' => t('Node'),
+    );
+  }
+
+  /**
+   * Implementation of setUp().
+   */
+  function setUp() {
+    parent::setUp();
+    // Create a user that is allowed to post; we'll use this to test the submission.
+    $web_user = $this->drupalCreateUser(array('create article content'));
+    $this->drupalLogin($web_user);
+    $this->web_user = $web_user;
+  }
+
+  /**
+   * Import test, to check if custom node ids are saved properly.
+   * Workflow: 
+   *  - first create a piece of content
+   *  - save the content
+   *  - check if node exists
+   */
+  function testImport() {
+    // Node ID must be a number that is not in the database.
+    $max_nid = db_result(db_query('SELECT MAX(nid) FROM {node}'));
+    $test_nid = $max_nid + mt_rand(1000, 1000000);
+    $title = $this->randomName(8); 
+    $node = array(
+      'title' => $title,
+      'body' => $this->randomName(32),
+      'uid' => $this->web_user->uid,
+      'type' => 'article',
+      'nid' => $test_nid,
+      'is_new' => TRUE,
+    );
+    $node = (object)$node;
+    node_save($node);
+    // Test the import. :)
+    $node_by_nid = node_load($test_nid);
+    $this->assertTrue($node_by_nid, t('Node load by node ID.'));
+
+    $node_by_title = node_load(array('title' => $title));
+    $this->assertTrue($node_by_title, t('Node load by node title.'));
+  }
+}
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.928
diff -u -p -r1.928 user.module
--- modules/user/user.module	12 Oct 2008 04:30:09 -0000	1.928
+++ modules/user/user.module	12 Oct 2008 11:18:41 -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;
       }
     }
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.17
diff -u -p -r1.17 user.test
--- modules/user/user.test	10 Oct 2008 07:49:49 -0000	1.17
+++ modules/user/user.test	12 Oct 2008 11:18:41 -0000
@@ -570,3 +570,48 @@ class UserAutocompleteTestCase extends D
     $this->assertRaw($this->unprivileged_user->name, t('User name found in autocompletion results.'));
   }
 }
+
+/**
+ * Test case to test user_save() behaviour.
+ */
+class UserSaveTestCase extends DrupalWebTestCase {
+  /**
+   * Implementation of getInfo().
+   */
+  function getInfo() {
+    return array(
+      'name' => t('User save test'),
+      'description' => t('Test user_save() for arbitrary new uid.'),
+      'group' => t('User'),
+    );
+  }
+
+  /**
+   * Test creating a user with arbitrary uid.
+   */
+  function testUserImport() {
+    // User ID must be a number that is not in the database.
+    $max_uid = db_result(db_query('SELECT MAX(uid) FROM {users}'));
+    $test_uid = $max_uid + mt_rand(1000, 1000000);
+    $test_name = $this->randomName(); 
+
+    // Create the base user, based on drupalCreateUser().
+    $user = array(
+      'name' => $test_name,
+      'uid' => $test_uid,
+      'mail' => $test_name . '@example.com',
+      'is_new' => TRUE,
+      'pass' => user_password(),
+      'status' => 1,
+    );
+    $user_by_return = user_save('', $user);
+    $this->assertTrue($user_by_return, t('Loading user by return of user_save().'));
+
+    // Test if created user exists.
+    $user_by_uid = user_load($test_uid);
+    $this->assertTrue($user_by_uid, t('Loading user by uid.'));
+
+    $user_by_name = user_load(array('name' => $test_name));
+    $this->assertTrue($user_by_name, t('Loading user by name.'));
+  }
+}