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

2 files changed, 10 insertions, 10 deletions

diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index 82658c171..af7f2090b 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -76,19 +76,19 @@ function comment_admin_overview($type = 'new', $arg) {
     $comments[$comment->cid] = '';
     $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
     $form['subject'][$comment->cid] = array(
-      '#value' => l($comment->subject, 'node/' . $comment->nid, array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid))
+      '#markup' => l($comment->subject, 'node/' . $comment->nid, array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid))
     );
     $form['username'][$comment->cid] = array(
-      '#value' => theme('username', $comment)
+      '#markup' => theme('username', $comment)
     );
     $form['node_title'][$comment->cid] = array(
-      '#value' => l($comment->node_title, 'node/' . $comment->nid)
+      '#markup' => l($comment->node_title, 'node/' . $comment->nid)
     );
     $form['timestamp'][$comment->cid] = array(
-      '#value' => format_date($comment->timestamp, 'small')
+      '#markup' => format_date($comment->timestamp, 'small')
     );
     $form['operations'][$comment->cid] = array(
-      '#value' => l(t('edit'), 'comment/edit/' . $comment->cid, array('query' => $destination))
+      '#markup' => l(t('edit'), 'comment/edit/' . $comment->cid, array('query' => $destination))
     );
   }
   $form['comments'] = array(
@@ -96,7 +96,7 @@ function comment_admin_overview($type = 'new', $arg) {
     '#options' => isset($comments) ? $comments: array()
   );
   $form['pager'] = array(
-    '#value' => theme('pager', NULL, 50, 0)
+    '#markup' => theme('pager', NULL, 50, 0)
   );
 
   return $form;
@@ -169,7 +169,7 @@ function theme_comment_admin_overview($form) {
   }
 
   $output .= theme('table', $form['header']['#value'], $rows);
-  if ($form['pager']['#value']) {
+  if ($form['pager']['#markup']) {
     $output .= drupal_render($form['pager']);
   }
 
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index fd949a2f6..ef03a0550 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1267,7 +1267,7 @@ function comment_form(&$form_state, $edit, $title = NULL) {
       $form['_author'] = array(
         '#type' => 'item',
         '#title' => t('Your name'),
-        '#value' => theme('username', $user),
+        '#markup' => theme('username', $user),
       );
       $form['author'] = array(
         '#type' => 'value',
@@ -1452,7 +1452,7 @@ function comment_form_add_preview($form, &$form_state) {
   }
 
   $form['comment_preview'] = array(
-    '#value' => $output,
+    '#markup' => $output,
     '#weight' => -100,
     '#prefix' => '<div class="preview">',
     '#suffix' => '</div>',
@@ -1473,7 +1473,7 @@ function comment_form_add_preview($form, &$form_state) {
   }
 
   $form['comment_preview_below'] = array(
-    '#value' => $output,
+    '#markup' => $output,
     '#weight' => 100,
   );