Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 21444)
+++ wp-admin/includes/template.php	(working copy)
@@ -1152,13 +1152,186 @@
 		else
 			echo '<th scope="row">' . $field['title'] . '</th>';
 		echo '<td>';
-		call_user_func($field['callback'], $field['args']);
+			switch ($field['callback']) :
+				case 'text':
+					do_settings_text( $field );
+					break;
+				case 'textarea':
+					do_settings_textarea( $field );
+					break;
+				case 'select':
+					do_settings_select( $field );
+					break;
+				case 'radio':
+					do_settings_radio( $field );
+					break;
+				case 'checkbox':
+					do_settings_checkbox( $field );
+					break;
+				case 'checkbox_group':
+					do_settings_checkbox_group( $field );
+					break;
+				default:
+					call_user_func($field['callback'], $field['args']);
+					break;
+			endswitch;
 		echo '</td>';
 		echo '</tr>';
 	}
 }
 
+
 /**
+ * Print out the default text field for add_settings_field()
+ *
+ * This outputs the default text field for callback "text".
+ *
+ * @since 3.5.0
+ *
+ * @param array $field Field arguments
+ */
+function do_settings_text( $field ) {
+
+	$value = get_option( $field['id'] );
+	if( ! empty( $field['args']['default'] ) )
+		$value = $value !== false ? $value : $field['args']['default'];
+
+	echo '<input type="text" class="regular-text" id="' . $field['id'] . '" name="' . $field['id'] . '" value="' . esc_attr( $value ) . '"/>';
+	
+	if( !empty( $field['args']['description'] ) )
+		echo '<div class="description">' . $field['args']['description'] . '</div>';
+
+}
+
+
+/**
+ * Print out the default textarea field for add_settings_field()
+ *
+ * This outputs the default text field for callback "texarea".
+ *
+ * @since 3.5.0
+ *
+ * @param array $field Field arguments
+ */
+function do_settings_textarea( $field ) {
+
+	$value = get_option( $field['id'] );
+	if( ! empty( $field['args']['default'] ) )
+		$value = $value !== false ? $value : $field['args']['default'];
+
+	echo '<textarea id="' . $field['id'] . '" name="' . $field['id'] . '" rows="10" cols="50" class="large-text">' . esc_attr( $value ) . '</textarea>';
+	
+	if( !empty( $field['args']['description'] ) )
+		echo '<div class="description">' . $field['args']['description'] . '</div>';
+
+}
+
+
+/**
+ * Print out the default select field for add_settings_field()
+ *
+ * This outputs the default text field for callback "select".
+ *
+ * @since 3.5.0
+ *
+ * @param array $field Field arguments
+ */
+function do_settings_select( $field ) {
+
+	if( empty( $field['args']['choices'] ) )
+		return;
+
+	$option = get_option( $field['id'] );
+	if( ! $option )
+		$option = ! empty( $field['args']['default'] ) ? $option : $field['args']['default'];
+
+	echo '<select id="' . $field['id'] . '" name="' . $field['id'] . '">';
+	foreach( $field['args']['choices'] as $key => $choice ) {
+		echo '<option value="' . $key . '" ' . selected( $key, $option, false ) . '>' . $choice . '</option>';
+	}
+	echo '</select>';
+	
+	if( !empty( $field['args']['description'] ) )
+		echo '<div class="description">' . $field['args']['description'] . '</div>';
+
+}
+
+
+/**
+ * Print out the default radio field for add_settings_field()
+ *
+ * This outputs the default text field for callback "radio".
+ *
+ * @since 3.5.0
+ *
+ * @param array $field Field arguments
+ */
+function do_settings_radio( $field ) {
+
+	if( empty( $field['args']['choices'] ) )
+		return;
+
+	$option = get_option( $field['id'] );
+	if( ! empty( $field['args']['default'] ) )
+		$option = $option !== false ? $option : $field['args']['default'];
+
+
+	foreach( $field['args']['choices'] as $key => $choice ) {
+		echo '<label><input type="radio" name="' . $field['id'] . '" value="' . $key . '" ' . checked( $key, $option, false ) . '/>&nbsp;' . $choice . '</label><br/>';
+	}
+	
+	if( !empty( $field['args']['description'] ) )
+		echo '<div class="description">' . $field['args']['description'] . '</div>';
+
+}
+
+
+/**
+ * Print out the default checkbox field for add_settings_field()
+ *
+ * This outputs the default text field for callback "checkbox".
+ *
+ * @since 3.5.0
+ *
+ * @param array $field Field arguments
+ */
+function do_settings_checkbox( $field ) {
+
+	$description = !empty( $field['args']['description'] ) ? $field['args']['description'] : '';
+
+	echo '<label><input type="checkbox" name="' . $field['id'] . '" value="1" ' . checked( 1, get_option( $field['id'] ), false ) . '/>&nbsp;' . $description . '</label>';
+	
+}
+
+
+/**
+ * Print out the default radio field for add_settings_field()
+ *
+ * This outputs the default text field for callback "radio".
+ *
+ * @since 3.5.0
+ *
+ * @param array $field Field arguments
+ */
+function do_settings_checkbox_group( $field ) {
+
+	if( empty( $field['args']['choices'] ) )
+		return;
+
+	$options = get_option( $field['id'] );
+	$options = is_array( $options ) ? $options : array();
+
+	foreach( $field['args']['choices'] as $key => $choice ) {
+		echo '<label><input type="checkbox" name="' . $field['id'] . '[' . $key . ']" value="' . $key . '" ' . checked( true, in_array( $key, $options ), false ) . '/>&nbsp;' . $choice . '</label><br/>';
+	}
+	
+	if( !empty( $field['args']['description'] ) )
+		echo '<div class="description">' . $field['args']['description'] . '</div>';
+
+}
+
+
+/**
  * Register a settings error to be displayed to the user
  *
  * Part of the Settings API. Use this to show messages to users about settings validation
