Index: bp-xprofile/bp-xprofile-templatetags.php
===================================================================
--- bp-xprofile/bp-xprofile-templatetags.php	(revision 3647)
+++ bp-xprofile/bp-xprofile-templatetags.php	(working copy)
@@ -187,10 +187,10 @@
 		if ( $class )
 			$css_classes[] = sanitize_title( esc_attr( $class ) );
 
-		/* Set a class with the field ID */
+		// Set a class with the field ID
 		$css_classes[] = 'field_' . $profile_template->field->id;
 
-		/* Set a class with the field name (sanitized) */
+		// Set a class with the field name (sanitized)
 		$css_classes[] = 'field_' . sanitize_title( $profile_template->field->name );
 
 		if ( $profile_template->current_field % 2 == 1 )
@@ -359,9 +359,36 @@
 		return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id . $array_box );
 	}
 
+/**
+ * bp_the_profile_field_options()
+ *
+ * Displays field options HTML for field types of 'selectbox', 'multiselectbox',
+ * 'radio', 'checkbox', and 'datebox'.
+ *
+ * @package BuddyPress Xprofile
+ * @since 1.1
+ *
+ * @uses bp_get_the_profile_field_options()
+ *
+ * @param array $args Specify type for datebox. Allowed 'day', 'month', 'year'.
+ */
 function bp_the_profile_field_options( $args = '' ) {
 	echo bp_get_the_profile_field_options( $args );
 }
+	/**
+	 * bp_get_the_profile_field_options()
+	 *
+	 * Retrieves field options HTML for field types of 'selectbox', 'multiselectbox',
+	 * 'radio', 'checkbox', and 'datebox'.
+	 *
+	 * @package BuddyPress Xprofile
+	 * @since 1.1
+	 *
+	 * @uses BP_XProfile_Field::get_children()
+	 * @uses BP_XProfile_ProfileData::get_value_byid()
+	 *
+	 * @param array $args Specify type for datebox. Allowed 'day', 'month', 'year'.
+	 */
 	function bp_get_the_profile_field_options( $args = '' ) {
 		global $field;
 
@@ -377,6 +404,10 @@
 
 		$options = $field->get_children();
 
+		// Setup some defaults
+		$html     = '';
+		$selected = '';
+
 		switch ( $field->type ) {
 
 			case 'selectbox': case 'multiselectbox':
@@ -385,45 +416,39 @@
 
 				for ( $k = 0; $k < count($options); $k++ ) {
 					$option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) );
-					$option_values = (array)$option_values;
+					$option_values = (array) $option_values;
 
-					/* Check for updated posted values, but errors preventing them from being saved first time */
-					foreach( (array)$option_values as $i => $option_value ) {
+					// Check for updated posted values, but errors preventing them from being saved first time
+					foreach( $option_values as $i => $option_value ) {
 						if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) {
 							if ( !empty( $_POST['field_' . $field->id] ) )
 								$option_values[$i] = $_POST['field_' . $field->id];
 						}
 					}
 
-					if ( in_array( $options[$k]->name, (array)$option_values ) || $options[$k]->is_default_option ) {
+					if ( in_array( $options[$k]->name, (array) $option_values ) || $options[$k]->is_default_option )
 						$selected = ' selected="selected"';
-					} else {
-						$selected = '';
-					}
 
-					$html .= apply_filters( 'bp_get_the_profile_field_options_select', '<option' . $selected . ' value="' . stripslashes( esc_attr( $options[$k]->name ) ) . '">' . stripslashes( esc_attr( $options[$k]->name ) ) . '</option>', $options[$k] );
+					$html .= apply_filters( 'bp_get_the_profile_field_options_select', '<option' . $selected . ' value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '">' . esc_attr( stripslashes( $options[$k]->name ) ) . '</option>', $options[$k] );
 				}
 				break;
 
 			case 'radio':
-				$html = '<div id="field_' . $field->id . '">';
+				$html .= '<div id="field_' . $field->id . '">';
 
 				for ( $k = 0; $k < count($options); $k++ ) {
 					$option_value = BP_XProfile_ProfileData::get_value_byid($options[$k]->parent_id);
 
-					/* Check for updated posted values, but errors preventing them from being saved first time */
+					// Check for updated posted values, but errors preventing them from being saved first time
 					if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) {
 						if ( !empty( $_POST['field_' . $field->id] ) )
 							$option_value = $_POST['field_' . $field->id];
 					}
 
-					if ( $option_value == $options[$k]->name || $value == $options[$k]->name || ( empty( $option_value ) && $options[$k]->is_default_option ) ) {
+					if ( $option_value == $options[$k]->name || $value == $options[$k]->name || ( empty( $option_value ) && $options[$k]->is_default_option ) )
 						$selected = ' checked="checked"';
-					} else {
-						$selected = '';
-					}
 
-					$html .= apply_filters( 'bp_get_the_profile_field_options_radio', '<label><input' . $selected . ' type="radio" name="field_' . $field->id . '" id="option_' . $options[$k]->id . '" value="' . stripslashes( esc_attr( $options[$k]->name ) ) . '"> ' . stripslashes( esc_attr( $options[$k]->name ) ) . '</label>', $options[$k] );
+					$html .= apply_filters( 'bp_get_the_profile_field_options_radio', '<label><input' . $selected . ' type="radio" name="field_' . $field->id . '" id="option_' . $options[$k]->id . '" value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '"> ' . esc_attr( stripslashes( $options[$k]->name ) ) . '</label>', $options[$k] );
 				}
 
 				$html .= '</div>';
@@ -432,7 +457,7 @@
 			case 'checkbox':
 				$option_values = BP_XProfile_ProfileData::get_value_byid($options[0]->parent_id);
 
-				/* Check for updated posted values, but errors preventing them from being saved first time */
+				// Check for updated posted values, but errors preventing them from being saved first time
 				if ( isset( $_POST['field_' . $field->id] ) && $option_values != maybe_serialize( $_POST['field_' . $field->id] ) ) {
 					if ( !empty( $_POST['field_' . $field->id] ) )
 						$option_values = $_POST['field_' . $field->id];
@@ -440,9 +465,7 @@
 
 				$option_values = maybe_unserialize($option_values);
 
-				$html = '';
 				for ( $k = 0; $k < count($options); $k++ ) {
-					$selected = '';
 					for ( $j = 0; $j < count($option_values); $j++ ) {
 						if ( $option_values[$j] == $options[$k]->name || @in_array( $options[$k]->name, $value ) || $options[$k]->is_default_option ) {
 							$selected = ' checked="checked"';
@@ -450,21 +473,25 @@
 						}
 					}
 
-					$html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', '<label><input' . $selected . ' type="checkbox" name="field_' . $field->id . '[]" id="field_' . $options[$k]->id . '_' . $k . '" value="' . stripslashes( esc_attr( $options[$k]->name ) ) . '"> ' . stripslashes( esc_attr( $options[$k]->name ) ) . '</label>', $options[$k] );
-					$selected = '';
+					$html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', '<label><input' . $selected . ' type="checkbox" name="field_' . $field->id . '[]" id="field_' . $options[$k]->id . '_' . $k . '" value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '"> ' . esc_attr( stripslashes( $options[$k]->name ) ) . '</label>', $options[$k] );
 				}
 				break;
 
 			case 'datebox':
+				$date = BP_XProfile_ProfileData::get_value_byid( $field->id );
 
-				if ( !empty( $field->data->value ) ) {
-					$day = date("j", $field->data->value);
-					$month = date("F", $field->data->value);
-					$year = date("Y", $field->data->value);
-					$default_select = ' selected="selected"';
+				// Set day, month, year defaults
+				$day   = '';
+				$month = '';
+				$year  = '';
+
+				if ( !empty( $date ) ) {
+					$day   = date( 'j', $date );
+					$month = date( 'F', $date );
+					$year  = date( 'Y', $date );
 				}
 
-				/* Check for updated posted values, but errors preventing them from being saved first time */
+				// Check for updated posted values, but errors preventing them from being saved first time
 				if ( !empty( $_POST['field_' . $field->id . '_day'] ) ) {
 					if ( $day != $_POST['field_' . $field->id . '_day'] )
 						$day = $_POST['field_' . $field->id . '_day'];
@@ -482,15 +509,10 @@
 
 				switch ( $type ) {
 					case 'day':
-						$html .= '<option value=""' . esc_attr( $default_select ) . '>--</option>';
+						$html .= '<option value=""' . selected( $day, '', false ) . '>--</option>';
 
 						for ( $i = 1; $i < 32; $i++ ) {
-							if ( $day == $i ) {
-								$selected = ' selected = "selected"';
-							} else {
-								$selected = '';
-							}
-							$html .= '<option value="' . $i .'"' . $selected . '>' . $i . '</option>';
+							$html .= '<option value="' . $i .'"' . selected( $day, $i, false ) . '>' . $i . '</option>';
 						}
 						break;
 
@@ -503,35 +525,23 @@
 								 __( 'October', 'buddypress' ), __( 'November', 'buddypress' ), __( 'December', 'buddypress' )
 								);
 
-						$html .= '<option value=""' . esc_attr( $default_select ) . '>------</option>';
+						$html .= '<option value=""' . selected( $month, '', false ) . '>------</option>';
 
 						for ( $i = 0; $i < 12; $i++ ) {
-							if ( $month == $eng_months[$i] ) {
-								$selected = ' selected = "selected"';
-							} else {
-								$selected = '';
-							}
-
-							$html .= '<option value="' . $eng_months[$i] . '"' . $selected . '>' . $months[$i] . '</option>';
+							$html .= '<option value="' . $eng_months[$i] . '"' . selected( $month, $eng_months[$i], false ) . '>' . $months[$i] . '</option>';
 						}
 						break;
 
 					case 'year':
-						$html .= '<option value=""' . esc_attr( $default_select ) . '>----</option>';
+						$html .= '<option value=""' . selected( $year, '', false ) . '>----</option>';
 
-						for ( $i = date( 'Y', time() ); $i > 1899; $i-- ) {
-							if ( $year == $i ) {
-								$selected = ' selected = "selected"';
-							} else {
-								$selected = '';
-							}
-
-							$html .= '<option value="' . $i .'"' . $selected . '>' . $i . '</option>';
+						for ( $i = date( 'Y' ); $i > 1899; $i-- ) {
+							$html .= '<option value="' . $i .'"' . selected( $year, $i, false ) . '>' . $i . '</option>';
 						}
 						break;
 				}
 
-				apply_filters( 'bp_get_the_profile_field_datebox', $html, $day, $month, $year, $default_select );
+				$html = apply_filters( 'bp_get_the_profile_field_datebox', $html, $type, $day, $month, $year );
 
 				break;
 		}