diff --git includes/form.inc includes/form.inc
index 4013f14..da358ad 100644
--- includes/form.inc
+++ includes/form.inc
@@ -2002,10 +2002,10 @@ function theme_radio($variables) {
$element = $variables['element'];
_form_set_class($element, array('form-radio'));
$output = '';
return $output;
@@ -2245,11 +2245,11 @@ function theme_checkbox($variables) {
_form_set_class($element, array('form-checkbox'));
$checkbox = '';
@@ -2693,7 +2693,7 @@ function theme_button($variables) {
$element = $variables['element'];
$element['#attributes']['class'][] = 'form-' . $element['#button_type'];
- return '\n";
+ return '\n";
}
/**
@@ -2736,7 +2736,7 @@ function theme_image_button($variables) {
*/
function theme_hidden($variables) {
$element = $variables['element'];
- return '\n";
+ return '\n";
}
/**
@@ -2768,7 +2768,7 @@ function theme_textfield($variables) {
}
_form_set_class($element, $class);
- $output .= '';
+ $output .= '';
return $output . $extra;
}
@@ -2823,7 +2823,7 @@ function theme_textarea($variables) {
$output = '';
_form_set_class($element, $class);
- $output .= '';
+ $output .= '';
$output .= '';
return $output;
@@ -2849,7 +2849,7 @@ function theme_password($variables) {
$maxlength = $element['#maxlength'] ? ' maxlength="' . $element['#maxlength'] . '" ' : '';
_form_set_class($element, array('form-text'));
- $output = '';
+ $output = '';
return $output;
}
@@ -2887,7 +2887,7 @@ function form_process_weight($element) {
function theme_file($variables) {
$element = $variables['element'];
_form_set_class($element, array('form-file'));
- return '\n";
+ return '\n";
}
/**
diff --git modules/simpletest/tests/common.test modules/simpletest/tests/common.test
index f5ca489..455a2d5 100644
--- modules/simpletest/tests/common.test
+++ modules/simpletest/tests/common.test
@@ -1361,6 +1361,90 @@ class DrupalRenderUnitTestCase extends DrupalWebTestCase {
// Test that passing arguments to the theme function works.
$this->assertEqual(drupal_render($element), $element['#foo'] . $element['#bar'], 'Passing arguments to theme functions works');
}
+
+ /**
+ * Test rendering form elements without passing through form_builder().
+ */
+ function testDrupalRenderFormElements() {
+ // Define a series of form elements.
+ $elements['button_test'] = array(
+ '#type' => 'button',
+ '#value' => $this->randomName(8),
+ );
+ $elements['textfield_test'] = array(
+ '#type' => 'textfield',
+ '#title' => $this->randomName(8),
+ '#value' => $this->randomName(8),
+ );
+ $elements['password_test'] = array(
+ '#type' => 'password',
+ '#title' => $this->randomName(8),
+ );
+ $elements['textarea_test'] = array(
+ '#type' => 'textarea',
+ '#title' => $this->randomName(8),
+ '#value' => $this->randomName(8),
+ );
+ $elements['radio_test'] = array(
+ '#type' => 'radio',
+ '#title' => $this->randomName(8),
+ '#value' => FALSE,
+ );
+ $elements['checkbox_test'] = array(
+ '#type' => 'checkbox',
+ '#title' => $this->randomName(8),
+ );
+ $elements['select_test'] = array(
+ '#type' => 'select',
+ '#title' => $this->randomName(8),
+ '#options' => array(0 => $this->randomName(8), 1 => $this->randomName(8)),
+ );
+ $elements['file_test'] = array(
+ '#type' => 'file',
+ '#title' => $this->randomName(8),
+ );
+ $elements['item_test'] = array(
+ '#type' => 'item',
+ '#title' => $this->randomName(8),
+ '#markup' => $this->randomName(8),
+ );
+ $elements['hidden_test'] = array(
+ '#type' => 'hidden',
+ '#value' => $this->randomName(8),
+ );
+ $elements['link_test'] = array(
+ '#type' => 'link',
+ '#title' => $this->randomName(8),
+ '#href' => $this->randomName(8),
+ '#options' => array('alias' => TRUE),
+ );
+ $elements['fieldset_test'] = array(
+ '#type' => 'fieldset',
+ '#title' => $this->randomName(8),
+ );
+ $elements['fieldset_test']['test_fieldset_item'] = array(
+ '#type' => 'item',
+ '#title' => $this->randomName(8),
+ '#markup' => $this->randomName(8),
+ );
+ // Render form elements into page content in order to use the assertField functions.
+ $this->drupalSetContent(drupal_render($elements));
+
+ // Verify existence of all created form elements.
+ $this->assertFieldByXPath('//input[@type="submit"]', $elements['button_test']['#value'], 'Button was rendered properly.');
+ $this->assertFieldByXPath('//input[@type="text"]', $elements['textfield_test']['#value'], 'Textfield was rendered properly.');
+ $this->assertFieldByXPath('//input[@type="password"]', NULL, 'Password was rendered properly.');
+ $this->assertFieldByXPath('//textarea', $elements['textarea_test']['#value'], 'Textarea was rendered properly.');
+ $this->assertFieldByXPath('//input[@type="radio"]', 0, 'Radio button was rendered properly.');
+ $this->assertFieldByXPath('//input[@type="checkbox"]', 1, 'Checkbox was rendered properly.');
+ $this->assertFieldByXPath('//select', 0, 'Select box was rendered properly.');
+ $this->assertFieldByXPath('//input[@type="file"]', NULL, 'File field was rendered properly.');
+ $this->assertRaw('\n " . $elements['item_test']['#markup'], 'Item was rendered properly.');
+ $this->assertFieldByXPath('//input[@type="hidden"]', $elements['hidden_test']['#value'], 'Hidden field was rendered properly.');
+ $this->assertRaw('', 'Link was rendered properly.');
+ $this->assertRaw('