- Removing trailing whitespace.

20 files changed, 68 insertions, 68 deletions

diff --git a/modules/block.module b/modules/block.module
index 7a39034b9..ed08c2010 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -202,7 +202,7 @@ function block_admin_display() {
   }
   init_theme();
 
-  // Fetch and sort blocks 
+  // Fetch and sort blocks
   $blocks = _block_rehash();
   usort($blocks, '_block_compare');
 
@@ -304,12 +304,12 @@ function theme_block_admin_display($form) {
       if ($status && $region != $last_region) {
         $region_title = t('%region', array('%region' => drupal_ucfirst($block_regions[$region])));
         $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
-        $last_region = $region;        
+        $last_region = $region;
       }
       // Output disabled header
       elseif ($status != $last_status) {
         $rows[] = array(array('data' => t('Disabled'), 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
-        $last_status = $status;        
+        $last_status = $status;
       }
 
       // Generate block row
diff --git a/modules/block/block.module b/modules/block/block.module
index 7a39034b9..ed08c2010 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -202,7 +202,7 @@ function block_admin_display() {
   }
   init_theme();
 
-  // Fetch and sort blocks 
+  // Fetch and sort blocks
   $blocks = _block_rehash();
   usort($blocks, '_block_compare');
 
@@ -304,12 +304,12 @@ function theme_block_admin_display($form) {
       if ($status && $region != $last_region) {
         $region_title = t('%region', array('%region' => drupal_ucfirst($block_regions[$region])));
         $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
-        $last_region = $region;        
+        $last_region = $region;
       }
       // Output disabled header
       elseif ($status != $last_status) {
         $rows[] = array(array('data' => t('Disabled'), 'class' => 'region', 'colspan' => ($throttle ? 7 : 6)));
-        $last_status = $status;        
+        $last_status = $status;
       }
 
       // Generate block row
diff --git a/modules/book.module b/modules/book.module
index 88edc1e1b..1692da7d5 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -357,10 +357,10 @@ function book_outline_submit($form_id, $form_values) {
 }
 
 /**
- * Given a node, this function returns an array of 'book node' objects 
- * representing the path in the book tree from the root to the 
+ * Given a node, this function returns an array of 'book node' objects
+ * representing the path in the book tree from the root to the
  * parent of the given node.
- * 
+ *
  * @param node - a book node object for which to compute the path
  *
  * @return - an array of book node objects representing the path of
diff --git a/modules/book/book.module b/modules/book/book.module
index 88edc1e1b..1692da7d5 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -357,10 +357,10 @@ function book_outline_submit($form_id, $form_values) {
 }
 
 /**
- * Given a node, this function returns an array of 'book node' objects 
- * representing the path in the book tree from the root to the 
+ * Given a node, this function returns an array of 'book node' objects
+ * representing the path in the book tree from the root to the
  * parent of the given node.
- * 
+ *
  * @param node - a book node object for which to compute the path
  *
  * @return - an array of book node objects representing the path of
diff --git a/modules/contact.module b/modules/contact.module
index 8008034dd..48f97137a 100644
--- a/modules/contact.module
+++ b/modules/contact.module
@@ -502,7 +502,7 @@ function contact_mail_page_validate($form_id, $form_values) {
  */
 function contact_mail_page_submit($form_id, $edit) {
 
-  // E-mail address of the sender: as the form field is a text field, 
+  // E-mail address of the sender: as the form field is a text field,
   // all instances of \r and \n have been automatically stripped from it.
   $from = $edit['mail'];
 
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 8008034dd..48f97137a 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -502,7 +502,7 @@ function contact_mail_page_validate($form_id, $form_values) {
  */
 function contact_mail_page_submit($form_id, $edit) {
 
-  // E-mail address of the sender: as the form field is a text field, 
+  // E-mail address of the sender: as the form field is a text field,
   // all instances of \r and \n have been automatically stripped from it.
   $from = $edit['mail'];
 
diff --git a/modules/filter.module b/modules/filter.module
index 82a7eb4a0..88f417d34 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -1049,7 +1049,7 @@ function _filter_html($text, $format) {
 function _filter_autop($text) {
   // All block level tags
   $block = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|p|h[1-6])';
-  
+
   // Split at <pre>, <script>, <style> and </pre>, </script>, </style> tags.
   // We don't apply any processing to the contents of these tags to avoid messing
   // up code. We look for matched pairs and allow basic nesting. For example:
@@ -1103,12 +1103,12 @@ function _filter_autop($text) {
 /**
  * Very permissive XSS/HTML filter for admin-only use.
  *
- * Use only for fields where it is impractical to use the 
+ * Use only for fields where it is impractical to use the
  * whole filter system, but where some (mainly inline) mark-up
  * is desired (so check_plain() is not acceptable).
  *
  * Allows all tags that can be used inside an HTML body, save
- * for scripts and styles. 
+ * for scripts and styles.
  */
 function filter_xss_admin($string) {
   return filter_xss($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'object', 'ol', 'p', 'param', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var'));
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 82a7eb4a0..88f417d34 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -1049,7 +1049,7 @@ function _filter_html($text, $format) {
 function _filter_autop($text) {
   // All block level tags
   $block = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|p|h[1-6])';
-  
+
   // Split at <pre>, <script>, <style> and </pre>, </script>, </style> tags.
   // We don't apply any processing to the contents of these tags to avoid messing
   // up code. We look for matched pairs and allow basic nesting. For example:
@@ -1103,12 +1103,12 @@ function _filter_autop($text) {
 /**
  * Very permissive XSS/HTML filter for admin-only use.
  *
- * Use only for fields where it is impractical to use the 
+ * Use only for fields where it is impractical to use the
  * whole filter system, but where some (mainly inline) mark-up
  * is desired (so check_plain() is not acceptable).
  *
  * Allows all tags that can be used inside an HTML body, save
- * for scripts and styles. 
+ * for scripts and styles.
  */
 function filter_xss_admin($string) {
   return filter_xss($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'object', 'ol', 'p', 'param', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var'));
diff --git a/modules/node.module b/modules/node.module
index cf8c085a2..6d8f9f43a 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1627,7 +1627,7 @@ function node_form_array($node) {
     $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 20);
     $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => theme('placeholder', variable_get('anonymous', 'Anonymous')))));
     $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
-  
+
     if (isset($node->nid)) {
       $form['author']['date']['#default_value'] = $node->date;
     }
diff --git a/modules/node/node.module b/modules/node/node.module
index cf8c085a2..6d8f9f43a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1627,7 +1627,7 @@ function node_form_array($node) {
     $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 20);
     $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => theme('placeholder', variable_get('anonymous', 'Anonymous')))));
     $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
-  
+
     if (isset($node->nid)) {
       $form['author']['date']['#default_value'] = $node->date;
     }
diff --git a/modules/profile.module b/modules/profile.module
index d355a2d82..38d49ffad 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -301,7 +301,7 @@ function profile_field_form_validate($form_id, $form_values) {
   $args1 = array($form_values['title'], $form_values['category']);
   $args2 = array($form_values['name']);
   $query_suffix = '';
-  
+
   if (isset($form_values['fid'])) {
     $args1[] = $args2[] = $form_values['fid'];
     $query_suffix = ' AND fid != %d';
@@ -321,7 +321,7 @@ function profile_field_form_validate($form_id, $form_values) {
 function profile_field_form_submit($form_id, $form_values) {
   if (!isset($form_values['fid'])) {
     db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s')", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['type'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['options'], $form_values['page']);
-    
+
     drupal_set_message(t('The field has been created.'));
     watchdog('profile', t('Profile field %field added under category %category.', array('%field' => theme('placeholder', $form_values['title']), '%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/profile'));
   }
@@ -331,7 +331,7 @@ function profile_field_form_submit($form_id, $form_values) {
     drupal_set_message(t('The field has been updated.'));
   }
   cache_clear_all();
-  
+
   return 'admin/settings/profile';
 }
 
@@ -346,7 +346,7 @@ function profile_field_delete($fid) {
   }
   $form['fid'] = array('#type' => 'value', '#value' => $fid);
   $form['title'] = array('#type' => 'value', '#value' => $field->title);
-  
+
   return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field'))), t('Delete'), t('Cancel')));
 }
 
@@ -356,12 +356,12 @@ function profile_field_delete($fid) {
 function profile_field_delete_submit($form_id, $form_values) {
   db_query('DELETE FROM {profile_fields} WHERE fid = %d', $form_values['fid']);
   db_query('DELETE FROM {profile_values} WHERE fid = %d', $form_values['fid']);
-  
+
   cache_clear_all();
-  
+
   drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $form_values['title']))));
   watchdog('profile', t('Profile field %field deleted.', array('%field' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/profile'));
-  
+
   return 'admin/settings/profile';
 }
 
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index d355a2d82..38d49ffad 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -301,7 +301,7 @@ function profile_field_form_validate($form_id, $form_values) {
   $args1 = array($form_values['title'], $form_values['category']);
   $args2 = array($form_values['name']);
   $query_suffix = '';
-  
+
   if (isset($form_values['fid'])) {
     $args1[] = $args2[] = $form_values['fid'];
     $query_suffix = ' AND fid != %d';
@@ -321,7 +321,7 @@ function profile_field_form_validate($form_id, $form_values) {
 function profile_field_form_submit($form_id, $form_values) {
   if (!isset($form_values['fid'])) {
     db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s')", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['type'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['options'], $form_values['page']);
-    
+
     drupal_set_message(t('The field has been created.'));
     watchdog('profile', t('Profile field %field added under category %category.', array('%field' => theme('placeholder', $form_values['title']), '%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/profile'));
   }
@@ -331,7 +331,7 @@ function profile_field_form_submit($form_id, $form_values) {
     drupal_set_message(t('The field has been updated.'));
   }
   cache_clear_all();
-  
+
   return 'admin/settings/profile';
 }
 
@@ -346,7 +346,7 @@ function profile_field_delete($fid) {
   }
   $form['fid'] = array('#type' => 'value', '#value' => $fid);
   $form['title'] = array('#type' => 'value', '#value' => $field->title);
-  
+
   return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field'))), t('Delete'), t('Cancel')));
 }
 
@@ -356,12 +356,12 @@ function profile_field_delete($fid) {
 function profile_field_delete_submit($form_id, $form_values) {
   db_query('DELETE FROM {profile_fields} WHERE fid = %d', $form_values['fid']);
   db_query('DELETE FROM {profile_values} WHERE fid = %d', $form_values['fid']);
-  
+
   cache_clear_all();
-  
+
   drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $form_values['title']))));
   watchdog('profile', t('Profile field %field deleted.', array('%field' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/profile'));
-  
+
   return 'admin/settings/profile';
 }
 
diff --git a/modules/system.module b/modules/system.module
index 662a6cd7f..8a57230a6 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -167,9 +167,9 @@ function system_test_clean_url($form_id) {
  * Allows users to individually set their theme and time zone.
  */
 function system_user($type, $edit, &$user, $category = NULL) {
-  if ($type == 'form' && $category == 'account') {    
+  if ($type == 'form' && $category == 'account') {
     $form['theme_select'] = system_theme_select_form(t('Selecting a different theme will change the look and feel of the site.'), $edit['theme'], 2);
-    
+
     if (variable_get('configurable_timezones', 1)) {
       $zones = _system_zonelist();
       $form['timezone'] = array('#type'=>'fieldset', '#title' => t('Locale settings'), '#weight' => 6);
@@ -178,7 +178,7 @@ function system_user($type, $edit, &$user, $category = NULL) {
         '#options' => $zones, '#description' => t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')
       );
     }
-    
+
     return $form;
   }
 }
@@ -207,10 +207,10 @@ function system_theme_select_form($description = '', $default_value = '', $weigh
       ksort($enabled);
 
       $form['themes'] = array(
-        '#type' => 'fieldset', 
-        '#title' => t('Theme configuration'), 
-        '#description' => $description, 
-        '#collapsible' => TRUE, 
+        '#type' => 'fieldset',
+        '#title' => t('Theme configuration'),
+        '#description' => $description,
+        '#collapsible' => TRUE,
         '#theme' => 'system_theme_select_form'
       );
 
diff --git a/modules/system/system.module b/modules/system/system.module
index 662a6cd7f..8a57230a6 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -167,9 +167,9 @@ function system_test_clean_url($form_id) {
  * Allows users to individually set their theme and time zone.
  */
 function system_user($type, $edit, &$user, $category = NULL) {
-  if ($type == 'form' && $category == 'account') {    
+  if ($type == 'form' && $category == 'account') {
     $form['theme_select'] = system_theme_select_form(t('Selecting a different theme will change the look and feel of the site.'), $edit['theme'], 2);
-    
+
     if (variable_get('configurable_timezones', 1)) {
       $zones = _system_zonelist();
       $form['timezone'] = array('#type'=>'fieldset', '#title' => t('Locale settings'), '#weight' => 6);
@@ -178,7 +178,7 @@ function system_user($type, $edit, &$user, $category = NULL) {
         '#options' => $zones, '#description' => t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')
       );
     }
-    
+
     return $form;
   }
 }
@@ -207,10 +207,10 @@ function system_theme_select_form($description = '', $default_value = '', $weigh
       ksort($enabled);
 
       $form['themes'] = array(
-        '#type' => 'fieldset', 
-        '#title' => t('Theme configuration'), 
-        '#description' => $description, 
-        '#collapsible' => TRUE, 
+        '#type' => 'fieldset',
+        '#title' => t('Theme configuration'),
+        '#description' => $description,
+        '#collapsible' => TRUE,
         '#theme' => 'system_theme_select_form'
       );
 
diff --git a/modules/tracker.module b/modules/tracker.module
index f82611ceb..aa076d2d4 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -67,7 +67,7 @@ function tracker_track_user() {
   if ($account = user_load(array('uid' => arg(1)))) {
     if ($account->status || user_access('administer users')) {
       drupal_set_title($account->name);
-      return tracker_page($account->uid);      
+      return tracker_page($account->uid);
     }
     else {
       drupal_access_denied();
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index f82611ceb..aa076d2d4 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -67,7 +67,7 @@ function tracker_track_user() {
   if ($account = user_load(array('uid' => arg(1)))) {
     if ($account->status || user_access('administer users')) {
       drupal_set_title($account->name);
-      return tracker_page($account->uid);      
+      return tracker_page($account->uid);
     }
     else {
       drupal_access_denied();
diff --git a/modules/upload.module b/modules/upload.module
index 9a6ba2f1f..9ca3d95b8 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -80,7 +80,7 @@ function upload_menu($may_cache) {
       foreach ($_SESSION['file_previews'] as $fid => $file) {
         $filename = file_create_filename($file->filename, file_create_path());
         if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) ==  FILE_DOWNLOADS_PRIVATE) {
-          // strip file_directory_path() from filename. @see file_create_url 
+          // strip file_directory_path() from filename. @see file_create_url
           if (strpos($filename, file_directory_path()) !== false) {
             $filename = trim(substr($filename, strlen(file_directory_path())), '\\/');
           }
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 9a6ba2f1f..9ca3d95b8 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -80,7 +80,7 @@ function upload_menu($may_cache) {
       foreach ($_SESSION['file_previews'] as $fid => $file) {
         $filename = file_create_filename($file->filename, file_create_path());
         if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) ==  FILE_DOWNLOADS_PRIVATE) {
-          // strip file_directory_path() from filename. @see file_create_url 
+          // strip file_directory_path() from filename. @see file_create_url
           if (strpos($filename, file_directory_path()) !== false) {
             $filename = trim(substr($filename, strlen(file_directory_path())), '\\/');
           }
diff --git a/modules/user.module b/modules/user.module
index 1c37286e9..aef2d6687 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -166,7 +166,7 @@ function user_save($account, $array = array(), $category = 'account') {
           $fields[] = $key;
           $values[] = md5($value);
           $s[] = "'%s'";
-          break;          
+          break;
         case 'uid':        case 'mode':     case 'sort':
         case 'threshold':  case 'created':  case 'access':
         case 'login':      case 'status':
@@ -785,11 +785,11 @@ function user_menu($may_cache) {
         // Always let a user view their own account
         $view_access |= $user->uid == arg(1);
         // Only admins can view blocked accounts
-        $view_access &= $account->status || $admin_access; 
+        $view_access &= $account->status || $admin_access;
 
         $items[] = array('path' => 'user/'. arg(1), 'title' => t('user'),
           'type' => MENU_CALLBACK, 'callback' => 'user_view',
-          'callback arguments' => array(arg(1)), 'access' => $view_access);        
+          'callback arguments' => array(arg(1)), 'access' => $view_access);
 
         $items[] = array('path' => 'user/'. arg(1) .'/view', 'title' => t('view'),
           'access' => $view_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
@@ -1176,12 +1176,12 @@ function user_register() {
       '#required' => TRUE,
     );
     $form['notify'] = array(
-     '#type' => 'checkbox', 
+     '#type' => 'checkbox',
      '#title' => t('Notify user of new account')
     );
   }
   $extra = _user_forms($null, $null, $null, 'register');
-  
+
   // Only display form_group around default fields if there are other groups.
   if ($extra) {
     $form['account'] = array('#type' => 'fieldset', '#title' => t('Account information'));
@@ -1246,7 +1246,7 @@ function user_register_submit($form_id, $form_values) {
       $body = $notify ? _user_mail_text('admin_body', $variables) : _user_mail_text('welcome_body', $variables);
 
       user_mail($mail, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
-      
+
       if ($notify) {
         drupal_set_message(t('Password and further instructions have been e-mailed to the new user %user.', array('%user' => theme('placeholder', $name))));
         return 'admin/user';
@@ -1474,7 +1474,7 @@ function _user_mail_text($messageid, $variables = array()) {
       case 'admin_subject':
         return t('An administrator created an account for you at %site', $variables);
       case 'admin_body':
-        return t("%username,\n\nA site administrator at %site has created an account for you. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);  
+        return t("%username,\n\nA site administrator at %site has created an account for you. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);
       case 'approval_subject':
         return t('Account details for %username at %site (pending admin approval)', $variables);
       case 'approval_body':
diff --git a/modules/user/user.module b/modules/user/user.module
index 1c37286e9..aef2d6687 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -166,7 +166,7 @@ function user_save($account, $array = array(), $category = 'account') {
           $fields[] = $key;
           $values[] = md5($value);
           $s[] = "'%s'";
-          break;          
+          break;
         case 'uid':        case 'mode':     case 'sort':
         case 'threshold':  case 'created':  case 'access':
         case 'login':      case 'status':
@@ -785,11 +785,11 @@ function user_menu($may_cache) {
         // Always let a user view their own account
         $view_access |= $user->uid == arg(1);
         // Only admins can view blocked accounts
-        $view_access &= $account->status || $admin_access; 
+        $view_access &= $account->status || $admin_access;
 
         $items[] = array('path' => 'user/'. arg(1), 'title' => t('user'),
           'type' => MENU_CALLBACK, 'callback' => 'user_view',
-          'callback arguments' => array(arg(1)), 'access' => $view_access);        
+          'callback arguments' => array(arg(1)), 'access' => $view_access);
 
         $items[] = array('path' => 'user/'. arg(1) .'/view', 'title' => t('view'),
           'access' => $view_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
@@ -1176,12 +1176,12 @@ function user_register() {
       '#required' => TRUE,
     );
     $form['notify'] = array(
-     '#type' => 'checkbox', 
+     '#type' => 'checkbox',
      '#title' => t('Notify user of new account')
     );
   }
   $extra = _user_forms($null, $null, $null, 'register');
-  
+
   // Only display form_group around default fields if there are other groups.
   if ($extra) {
     $form['account'] = array('#type' => 'fieldset', '#title' => t('Account information'));
@@ -1246,7 +1246,7 @@ function user_register_submit($form_id, $form_values) {
       $body = $notify ? _user_mail_text('admin_body', $variables) : _user_mail_text('welcome_body', $variables);
 
       user_mail($mail, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
-      
+
       if ($notify) {
         drupal_set_message(t('Password and further instructions have been e-mailed to the new user %user.', array('%user' => theme('placeholder', $name))));
         return 'admin/user';
@@ -1474,7 +1474,7 @@ function _user_mail_text($messageid, $variables = array()) {
       case 'admin_subject':
         return t('An administrator created an account for you at %site', $variables);
       case 'admin_body':
-        return t("%username,\n\nA site administrator at %site has created an account for you. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);  
+        return t("%username,\n\nA site administrator at %site has created an account for you. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);
       case 'approval_subject':
         return t('Account details for %username at %site (pending admin approval)', $variables);
       case 'approval_body':