? uuid-972258-1.patch
? uuid-972258-2.patch
Index: uuid.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uuid/uuid.module,v
retrieving revision 1.1.2.17
diff -u -p -r1.1.2.17 uuid.module
--- uuid.module	16 Nov 2010 02:57:59 -0000	1.1.2.17
+++ uuid.module	24 Jan 2011 16:30:31 -0000
@@ -143,11 +143,17 @@ function uuid_user($op, &$edit, &$user, 
       $user->uuid = db_result(db_query('SELECT uuid FROM {uuid_users} WHERE uid = %d', $user->uid));
       break;
     case 'insert':
+      $insert = NULL;
       if (isset($user->uuid) && uuid_is_valid($user->uuid)) {
-        db_query("INSERT INTO {uuid_users} (uid, uuid) VALUES (%d, '%s')", $user->uid, $user->uuid);
+        $insert = $user->uuid;
+      }
+      else if (isset($edit['uuid']) && uuid_is_valid($edit['uuid'])) {
+        $insert = $user->uuid = $edit['uuid'];
       }
       else if (variable_get('uuid_automatic_for_users', FALSE)) {
-        $user->uuid = uuid_uuid();
+        $insert = $user->uuid = uuid_uuid();
+      }
+      if ($insert) {
         db_query("INSERT INTO {uuid_users} (uid, uuid) VALUES (%d, '%s')", $user->uid, $user->uuid);
       }
       break;