? 574194-bakery-store-slave-uid.patch
? 932774_better_profile_saving_12.patch
? 956316-bakery-notices_0.patch
? 967682_profile_bakery_register_submit.patch
Index: bakery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bakery/bakery.module,v
retrieving revision 1.52.4.11
diff -u -p -r1.52.4.11 bakery.module
--- bakery.module	16 Nov 2010 14:34:45 -0000	1.52.4.11
+++ bakery.module	16 Nov 2010 15:02:26 -0000
@@ -342,10 +342,12 @@ function _bakery_reset_submit($form, &$f
 function _bakery_register_submit($form, &$form_state) {
   // Create an array of fields to send to the master. We need these four fields.
   $allowed = array('name', 'mail', 'pass', 'timezone');
-  // Now figure out profile field names that are visible on the registration form.
-  $field_names = db_query("SELECT name FROM {profile_fields} WHERE register = 1");
-  while ($field_name = db_fetch_object($field_names)) {
-    $allowed[] = $field_name->name;
+  if (module_exists('profile')) {
+    // Now figure out profile field names that are visible on the registration form.
+    $field_names = db_query("SELECT name FROM {profile_fields} WHERE register = 1");
+    while ($field_name = db_fetch_object($field_names)) {
+      $allowed[] = $field_name->name;
+    }
   }
   foreach ($form_state['values'] as $key => $value) {
     if (!in_array($key, $allowed)) {
