- Patch #252013 by Eaton, pwolanin, Susurrus et al: drupal_render() now printes #markup, not #value.

3 files changed, 8 insertions, 19 deletions

diff --git a/includes/common.inc b/includes/common.inc
index c5ad0d39c..7263d0a5b 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2741,26 +2741,15 @@ function drupal_render(&$elements) {
     // Render all the children that use a theme function.
     if (isset($elements['#theme']) && empty($elements['#theme_used'])) {
       $elements['#theme_used'] = TRUE;
-
-      $previous = array();
-      foreach (array('#value', '#type', '#prefix', '#suffix') as $key) {
-        $previous[$key] = isset($elements[$key]) ? $elements[$key] : NULL;
-      }
       // If we rendered a single element, then we will skip the renderer.
       if (empty($children)) {
         $elements['#printed'] = TRUE;
       }
       else {
-        $elements['#value'] = '';
+        $elements['#markup'] = '';
       }
-      $elements['#type'] = 'markup';
 
-      unset($elements['#prefix'], $elements['#suffix']);
       $content = theme($elements['#theme'], $elements);
-
-      foreach (array('#value', '#type', '#prefix', '#suffix') as $key) {
-        $elements[$key] = isset($previous[$key]) ? $previous[$key] : NULL;
-      }
     }
     // Render each of the children using drupal_render and concatenate them.
     if (!isset($content) || $content === '') {
diff --git a/includes/form.inc b/includes/form.inc
index b4181d449..319ed46e3 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1836,7 +1836,7 @@ function form_expand_ahah($element) {
  * @ingroup themeable
  */
 function theme_item($element) {
-  return theme('form_element', $element, $element['#value'] . (!empty($element['#children']) ? $element['#children'] : ''));
+  return theme('form_element', $element, $element['#markup'] . (!empty($element['#children']) ? $element['#children'] : ''));
 }
 
 /**
@@ -2085,7 +2085,7 @@ function theme_textarea($element) {
  */
 
 function theme_markup($element) {
-  return (isset($element['#value']) ? $element['#value'] : '') . (isset($element['#children']) ? $element['#children'] : '');
+  return (isset($element['#markup']) ? $element['#markup'] : '') . (isset($element['#children']) ? $element['#children'] : '');
 }
 
 /**
diff --git a/includes/locale.inc b/includes/locale.inc
index 1937bc904..fe43d6906 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -46,9 +46,9 @@ function locale_languages_overview_form() {
       '#type' => 'weight',
       '#default_value' => $language->weight
     );
-    $form['name'][$langcode] = array('#value' => check_plain($language->name));
-    $form['native'][$langcode] = array('#value' => check_plain($language->native));
-    $form['direction'][$langcode] = array('#value' => ($language->direction == LANGUAGE_RTL ? t('Right to left') : t('Left to right')));
+    $form['name'][$langcode] = array('#markup' => check_plain($language->name));
+    $form['native'][$langcode] = array('#markup' => check_plain($language->native));
+    $form['direction'][$langcode] = array('#markup' => ($language->direction == LANGUAGE_RTL ? t('Right to left') : t('Left to right')));
   }
   $form['enabled'] = array('#type' => 'checkboxes',
     '#options' => $options,
@@ -230,7 +230,7 @@ function _locale_languages_common_controls(&$form, $language = NULL) {
     $form['langcode_view'] = array(
       '#type' => 'item',
       '#title' => t('Language code'),
-      '#value' => $language->language
+      '#markup' => $language->language
     );
     $form['langcode'] = array(
       '#type' => 'value',
@@ -782,7 +782,7 @@ function locale_translate_edit_form(&$form_state, $lid) {
     'original' => array(
       '#type'  => 'item',
       '#title' => t('Original text'),
-      '#value' => check_plain(wordwrap($source->source, 0)),
+      '#markup' => check_plain(wordwrap($source->source, 0)),
     ),
     'lid' => array(
       '#type'  => 'value',