diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-04-30 00:32:48 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-04-30 00:32:48 +0000 |
| commit | 8e10f1d48cd2b1093c46dac06322b4540cdc8f2b (patch) | |
| tree | 5bc7947c6c8d3c9c2727e7bfedaccab818331212 /includes/form.inc | |
| parent | 2527090b16cb32e1acb093ac08d279f8c49c61e5 (diff) | |
| download | brdo-8e10f1d48cd2b1093c46dac06322b4540cdc8f2b.tar.gz brdo-8e10f1d48cd2b1093c46dac06322b4540cdc8f2b.tar.bz2 | |
Forward port from 4.7
#60797, leftovers, patch from chx
Diffstat (limited to 'includes/form.inc')
| -rw-r--r-- | includes/form.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/includes/form.inc b/includes/form.inc index a74558b96..04af91e77 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -504,7 +504,12 @@ function form_render(&$elements) { $previous_value = $elements['#value']; $previous_type = $elements['#type']; - $elements['#value'] = ''; + if (empty($children)) { + $elements['#printed'] = TRUE; + } + else { + $elements['#value'] = ''; + } $elements['#type'] = 'markup'; $content = theme($elements['#theme'], $elements); @@ -512,9 +517,6 @@ function form_render(&$elements) { $elements['#value'] = $previous_value; $elements['#type'] = $previous_type; // if we rendered a single element, then we will skip the renderer - if (empty($children)) { - $elements['#printed'] = TRUE; - } unset($elements['#prefix'], $elements['#suffix']); } /* render each of the children using form_render and concatenate them */ |