### Eclipse Workspace Patch 1.0
#P Acquia - Library
Index: docroot/sites/all/modules/bakery/bakery.install
===================================================================
--- docroot/sites/all/modules/bakery/bakery.install	(revision 23678)
+++ docroot/sites/all/modules/bakery/bakery.install	(working copy)
@@ -97,3 +97,8 @@
 
   return $return;
 }
+
+function bakery_update_6004() {
+  variable_set("bakery_contact_url", variable_get('bakery_master','http://drupal.org/')."contact");
+  return array();
+}
Index: docroot/sites/all/modules/bakery/bakery.module
===================================================================
--- docroot/sites/all/modules/bakery/bakery.module	(revision 23678)
+++ docroot/sites/all/modules/bakery/bakery.module	(working copy)
@@ -426,47 +426,53 @@
 
   $form['bakery_is_master'] = array(
     '#type' => 'checkbox',
-    '#title' => 'Is this the master site?',
+    '#title' => t('Is this the master site?'),
     '#default_value' => variable_get('bakery_is_master', 0),
     '#description' => t('On the master site, accounts need to be created by traditional processes, i.e by a user registering or an admin creating them.'),
   );
 
   $form['bakery_master'] = array(
     '#type' => 'textfield',
-    '#title' => 'Master site',
+    '#title' => t('Master site'),
     '#default_value' => variable_get('bakery_master', 'http://drupal.org/'),
     '#description' => t('Specify the master site for your bakery network.'),
   );
-
+    $form['bakery_contact_url'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Site Contact URL'),
+    '#default_value' => variable_get('bakery_contactd_url', 'http://drupal.org/'),
+    '#description' => t('Specify the master contact url location for your bakery network.'),
+  );
+  
   $form['bakery_slaves'] = array(
     '#type' => 'textarea',
-    '#title' => 'Slave sites',
+    '#title' => t('Slave sites'),
     '#default_value' => implode("\n", variable_get('bakery_slaves', array())),
     '#description' => t('Specify any slave sites in your bakery network that you want to update if a user changes email or username on the master. Enter one site per line, in the form "http://sub.example.com/".'),
   );
 
   $form['bakery_help_text'] = array(
     '#type' => 'textarea',
-    '#title' => 'Help text for users with synch problems.',
+    '#title' => t('Help text for users with synch problems.'),
     '#default_value' => variable_get('bakery_help_text', 'Otherwise you can contact the site administrators.'),
     '#description' => t('This message will be shown to users if/when they have problems synching their accounts. It is an alternative to the "self repair" option and can be blank.'),
   );
 
   $form['bakery_freshness'] = array(
     '#type' => 'textfield',
-    '#title' => 'Seconds of age before a cookie is old',
+    '#title' => t('Seconds of age before a cookie is old'),
     '#default_value' => variable_get('bakery_freshness', '3600'),
   );
 
   $form['bakery_key'] = array(
     '#type' => 'textfield',
-    '#title' => 'Private key for cookie validation',
+    '#title' => t('Private key for cookie validation'),
     '#default_value' => variable_get('bakery_key', ''),
   );
 
   $form['bakery_domain'] = array(
     '#type' => 'textfield',
-    '#title' => 'Cookie domain',
+    '#title' => t('Cookie domain'),
     '#default_value' => variable_get('bakery_domain', ''),
   );
 
@@ -482,7 +488,7 @@
   }
   $form['bakery_supported_fields'] = array(
     '#type' => 'checkboxes',
-    '#title' => 'Supported profile fields',
+    '#title' => t('Supported profile fields'),
     '#default_value' => $default,
     '#options' => $options,
     '#description' => t('Choose the profile fields that should be exported by the master and imported on the slaves. Username and E-mail are always exported. The correct export of individual fields may depend on the appropriate settings for other modules on both master and slaves. You need to configure this setting on both the master and the slaves.'),
@@ -849,7 +855,7 @@
         if ($count > 1) {
           // Uh oh.
           watchdog('bakery', 'Account uniqueness problem: Multiple users found with init %init.', array('%init' => $cookie['init']), 'error');
-          drupal_set_message(t('Account uniqueness problem detected. <a href="@contact">Please contact the site administrator.</a>', array('@contact' => variable_get('bakery_master', 'http://drupal.org/') .'contact')), 'error');
+          drupal_set_message(t('Account uniqueness problem detected. <a href="@contact">Please contact the site administrator.</a>', array('@contact' => variable_get('bakery_contact_url', 'http://drupal.org/'))), 'error');
         }
         if ($count == 1) {
           $account = user_load(array('init' => $cookie['init']));
@@ -1506,12 +1512,12 @@
   $help = '';
 
   if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE init = '%s'", $cookie['init'])) > 1) {
-    drupal_set_message(t('Multiple accounts are associated with your master account. This must be fixed manually. <a href="@contact">Please contact the site administrator.</a>', array('%email' => $cookie['mail'], '@contact' => variable_get('bakery_master', 'http://drupal.org/') .'contact')));
+    drupal_set_message(t('Multiple accounts are associated with your master account. This must be fixed manually. <a href="@contact">Please contact the site administrator.</a>', array('%email' => $cookie['mail'], '@contact' => variable_get('bakery_contact_url', 'http://drupal.org/'))));
     $form['pass']['#disabled'] = TRUE;
     $form['submit']['#disabled'] = TRUE;
   }
   else if ($samename && $samemail && $samename->uid != $samemail->uid) {
-    drupal_set_message(t('Both an account with matching name and an account with matching email address exist, but they are different accounts. This must be fixed manually. <a href="@contact">Please contact the site administrator.</a>', array('%email' => $cookie['mail'], '@contact' => variable_get('bakery_master', 'http://drupal.org/') .'contact')));
+    drupal_set_message(t('Both an account with matching name and an account with matching email address exist, but they are different accounts. This must be fixed manually. <a href="@contact">Please contact the site administrator.</a>', array('%email' => $cookie['mail'], '@contact' => variable_get('bakery_contact_url', 'http://drupal.org/'))));
     $form['pass']['#disabled'] = TRUE;
     $form['submit']['#disabled'] = TRUE;
   }
@@ -1542,7 +1548,7 @@
   if (!($account && $account->uid)) {
     watchdog('bakery', 'Login attempt failed for %user while running uncrumble.', array('%user' => $form_state['values']['name']));
     // Can't pretend that it was the "username or password" so let's be helpful instead.
-    form_set_error('pass', t('Sorry, unrecognized password. If you have forgotten your %site password, please <a href="@contact">contact the site administrator.</a>', array('%site' => variable_get('site_name', 'Drupal'), '@contact' => variable_get('bakery_master', 'http://drupal.org/') .'contact')), 'error');
+    form_set_error('pass', t('Sorry, unrecognized password. If you have forgotten your %site password, please <a href="@contact">contact the site administrator.</a>', array('%site' => variable_get('site_name', 'Drupal'), '@contact' => variable_get('bakery_contact_url', 'http://drupal.org/'))), 'error');
   }
   else {
     $form_state['bakery_uncrumble_account'] = $account;