? misc/Thumbs.db
? themes/bluemarine/Thumbs.db
? themes/pushbutton/Thumbs.db
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.448
diff -u -r1.448 common.inc
--- includes/common.inc	25 May 2005 06:28:59 -0000	1.448
+++ includes/common.inc	25 May 2005 15:15:00 -0000
@@ -1320,6 +1320,33 @@
 }
 
 /**
+ * Format two single-line text fields that do not display their contents visibly using the second for a confirmation field.
+ *
+ * @param $title
+ *   The label for the text fields.
+  * @param $name1
+ *   The internal name used to refer to the first (primary) field.  Also acts as the style name.
+  * @param $name2
+ *   The internal name used to refer to the second (confirm) field.
+ * @param $size
+ *   A measure of the visible size of both fields (passed directly to HTML).
+ * @param $maxlength
+ *   The maximum number of characters that may be entered in the fields.
+ * @param $description
+ *   Explanatory text to display after the fields.
+ * @param $attributes
+ *   An associative array of HTML attributes to add to both fields.
+ * @param $required
+ *   Whether the user must enter some text in the fields.
+ * @return
+ *   A themed HTML string representing the fields.
+ */
+function form_password_confirm($title, $name1 = 'pass1', $name2 = 'pass2', $size = 16, $maxlength = 64, $description = NULL, $attributes = NULL, $required = FALSE) {
+  $size = $size ? ' size="'. $size .'"' : '';
+  return theme('form_element', $title, '<input type="password" class="'. _form_get_class('form-password', $required, _form_get_error($name1)) .'" maxlength="'. $maxlength .'" name="edit['. $name1 .']" id="edit-'. form_clean_id($name1) .'"'. $size . drupal_attributes($attributes) .' /> <input type="password" class="'. _form_get_class('form-password', $required, _form_get_error($name2)) .'" maxlength="'. $maxlength .'" name="edit['. $name2 .']" id="edit-'. form_clean_id($name2) .'"'. $size . drupal_attributes($attributes) .' />', $description, 'edit-'. $name1, $required, _form_get_error($name). " " ._form_get_error($name));
+}
+
+/**
  * Format a multiple-line text field.
  *
  * @param $title
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.475
diff -u -r1.475 user.module
--- modules/user.module	24 May 2005 06:00:22 -0000	1.475
+++ modules/user.module	25 May 2005 15:13:41 -0000
@@ -1088,7 +1088,7 @@
   // Account information:
   $group  = form_textfield(t('Username'), 'name', $edit['name'], 30, 55, t('Your full name or your preferred username: only letters, numbers and spaces are allowed.'), NULL, TRUE);
   $group .= form_textfield(t('E-mail address'), 'mail', $edit['mail'], 30, 55, t('Insert a valid e-mail address.  All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'), NULL, TRUE);
-  $group .= form_item(t('Password'), '<input type="password" class="form-password" name="edit[pass1]" size="12" maxlength="24" /> <input type="password" class="form-password" name="edit[pass2]" size="12" maxlength="24" />', t('Enter your new password twice if you want to change your current password, or leave it blank if you are happy with your current password.'), NULL, TRUE);
+  $group .= form_password_confirm(t('Change Password'),'pass1','pass2',16,64, t('Enter your new password twice if you want to change your current password, or leave it blank if you are happy with your current password.'));
 
   if (user_access('administer users')) {
     $group .= form_radios(t('Status'), 'status', $edit['status'], array(t('Blocked'), t('Active')));