From 8e10f1d48cd2b1093c46dac06322b4540cdc8f2b Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Sun, 30 Apr 2006 00:32:48 +0000
Subject: [PATCH] Forward port from 4.7 #60797, leftovers, patch from chx
---
includes/form.inc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/includes/form.inc b/includes/form.inc
index a74558b96736..04af91e77935 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 */
--
GitLab